Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 19 Nov 2011 14:29:45 +0000 (15:29 +0100)
committerStéphane Jacob <sj@m4x.org>
Sat, 19 Nov 2011 14:29:45 +0000 (15:29 +0100)

Trivial merge