Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 13 Sep 2011 17:59:10 +0000 (19:59 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 13 Sep 2011 17:59:10 +0000 (19:59 +0200)

Trivial merge