Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 9 Mar 2014 19:58:50 +0000 (20:58 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 9 Mar 2014 19:58:50 +0000 (20:58 +0100)

Trivial merge