Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 26 May 2013 14:26:16 +0000 (16:26 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 26 May 2013 14:26:16 +0000 (16:26 +0200)

Trivial merge