Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Fri, 13 May 2011 09:10:09 +0000 (11:10 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 13 May 2011 09:10:09 +0000 (11:10 +0200)

Trivial merge