Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 24 Mar 2012 09:59:03 +0000 (10:59 +0100)
committerStéphane Jacob <sj@m4x.org>
Sat, 24 Mar 2012 09:59:03 +0000 (10:59 +0100)

Trivial merge