Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 4 Apr 2011 14:36:41 +0000 (16:36 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 4 Apr 2011 14:36:41 +0000 (16:36 +0200)
commit54722967b9b605dca8cff67fc3a050194beba368
tree72dd047129819c31933fcd4c3bce6607bb300247
parentf9301bff369ef2352bc1eb2c824919874e616066
parent05978b09201b86278849d6448a15b4a59e2ed852
Merge branch 'xorg/maint' into xorg/master