Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 15:57:09 +0000 (17:57 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 15:57:09 +0000 (17:57 +0200)

Trivial merge