Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 16 May 2011 08:07:44 +0000 (10:07 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 16 May 2011 08:07:44 +0000 (10:07 +0200)

Trivial merge