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)

Trivial merge