Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 21:51:17 +0000 (23:51 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 28 Jun 2011 21:51:17 +0000 (23:51 +0200)

Trivial merge