Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 12 Sep 2011 15:12:04 +0000 (17:12 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 12 Sep 2011 15:12:04 +0000 (17:12 +0200)

Trivial merge