Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 3 Nov 2013 17:51:27 +0000 (18:51 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Sun, 3 Nov 2013 17:51:27 +0000 (18:51 +0100)

Trivial merge