Merge xorg/maint into xorg/master.
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 24 Mar 2013 18:25:26 +0000 (19:25 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 24 Mar 2013 18:25:26 +0000 (19:25 +0100)

Trivial merge