Merge branch 'xorg/maint' into xorg/master
authorRaphaël Barrois <raphael.barrois@polyconseil.fr>
Thu, 19 Dec 2013 18:59:48 +0000 (19:59 +0100)
committerRaphaël Barrois <raphael.barrois@polyconseil.fr>
Thu, 19 Dec 2013 18:59:48 +0000 (19:59 +0100)

Trivial merge