Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Thu, 7 Jul 2011 08:47:55 +0000 (10:47 +0200)
committerStéphane Jacob <sj@m4x.org>
Thu, 7 Jul 2011 08:47:55 +0000 (10:47 +0200)

Trivial merge