Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 12 Jun 2012 18:22:51 +0000 (20:22 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 12 Jun 2012 18:22:51 +0000 (20:22 +0200)

Trivial merge