Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Wed, 4 Jan 2012 22:47:51 +0000 (23:47 +0100)
committerStéphane Jacob <sj@m4x.org>
Wed, 4 Jan 2012 22:47:51 +0000 (23:47 +0100)

Trivial merge