Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 12 Sep 2011 15:12:04 +0000 (17:12 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 12 Sep 2011 15:12:04 +0000 (17:12 +0200)
commitdf330f4c92bd73cc99fb5a12ec156426db819399
treecc3547b061c5ab67e2558e18d83e474894f913be
parentff9e2d12d4253481dbae7ae92735a354276674a4
parent250915b80097c3a97170e024bdb99560130a25d6
Merge branch 'xorg/maint' into xorg/master