Merge branch 'xorg/maint' into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Tue, 25 Mar 2014 22:54:04 +0000 (23:54 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Tue, 25 Mar 2014 22:54:04 +0000 (23:54 +0100)

Trivial merge