Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Thu, 22 Sep 2011 07:43:00 +0000 (09:43 +0200)
committerStéphane Jacob <sj@m4x.org>
Thu, 22 Sep 2011 07:43:00 +0000 (09:43 +0200)

Trivial merge