Merge xorg/maint into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 30 Nov 2012 08:54:47 +0000 (09:54 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 30 Nov 2012 08:54:47 +0000 (09:54 +0100)

Trivial merge