Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 10 May 2011 19:48:13 +0000 (21:48 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 10 May 2011 19:48:13 +0000 (21:48 +0200)
commiteae1c10a6f7ce483f6bbc107e68189bcddfcafe9
tree29c057a1e7ab7629b5f618adf8dc72653be751ea
parent39b4464b0c10e5782256a99efc17d9fbf5626042
parentcb8b79453edde16b7ad7a556807ed9c970deaf74
Merge branch 'xorg/maint' into xorg/master