Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 23 Mar 2014 10:44:39 +0000 (11:44 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 23 Mar 2014 10:44:39 +0000 (11:44 +0100)

Trivial merge