Merge branch 'xorg/maint' into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 9 Sep 2011 22:35:10 +0000 (00:35 +0200)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 9 Sep 2011 22:35:10 +0000 (00:35 +0200)

Trivial merge