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

Trivial merge