Merge xorg/maint into master.
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Mon, 18 Feb 2013 22:12:03 +0000 (23:12 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Mon, 18 Feb 2013 22:12:03 +0000 (23:12 +0100)
commitfbce8256287fab852caa563e20e220ee4d0a0518
tree4e703d1f17c819d2d87acf64e66c99e5f9fd1475
parentcc90e3e39e0216b5294f3a8ab41e8dbab0ea91f9
parent32ced1693d56d1c4dcd7379e36547447aca18d93
Merge xorg/maint into master.