Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 3 Apr 2011 12:43:56 +0000 (14:43 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 3 Apr 2011 12:43:56 +0000 (14:43 +0200)
commit1773c63489f9bf9b3ed3a96b97f3d4f176400fa4
tree2bfa4c2cb7566c751aa4dc67f1209801ba31bde0
parent4a32d39081b96dd1c860cc7b94ff116237845d4e
parente1ff3b4ffe4650f20e84590c8b53504311270472
Merge branch 'xorg/maint' into xorg/master