Merge branch 'xorg/maint'
authorNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Mon, 10 Mar 2014 17:59:32 +0000 (18:59 +0100)
committerNicolas Iooss <nicolas.iooss_git@polytechnique.org>
Mon, 10 Mar 2014 17:59:32 +0000 (18:59 +0100)

Trivial merge