Merge xorg/maint into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 16 Nov 2012 22:10:20 +0000 (23:10 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 16 Nov 2012 22:10:20 +0000 (23:10 +0100)

Trivial merge