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

Trivial merge