Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 12 Dec 2011 11:45:49 +0000 (12:45 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 12 Dec 2011 11:45:49 +0000 (12:45 +0100)

Trivial merge