Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Thu, 31 Mar 2011 20:39:07 +0000 (22:39 +0200)
committerStéphane Jacob <sj@m4x.org>
Thu, 31 Mar 2011 20:39:07 +0000 (22:39 +0200)
commited40b531b6a8a187f49c963ed4407e72208afbb6
tree8b33878dc6c87901aefeff521b526d912c96fbe4
parente716ddc9a0bf1e6be092ec0c09b5e25d3f1695c1
parent94b64368ff6ee87426d450da36831220753268d7
Merge branch 'xorg/maint' into xorg/master