Merge remote branch 'origin/xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 2 Apr 2011 15:52:51 +0000 (17:52 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 2 Apr 2011 15:52:51 +0000 (17:52 +0200)
commit97980d82cffb765e16502de2d1fb694d69631b25
treee052834aa47d96198e811a38299400a3d8611526
parented40b531b6a8a187f49c963ed4407e72208afbb6
parent7e82b5458fe9ecb07a923daacc5319b07901a848
Merge remote branch 'origin/xorg/maint' into xorg/master