Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 9 Apr 2011 15:31:19 +0000 (17:31 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 9 Apr 2011 15:31:19 +0000 (17:31 +0200)

Trivial merge