Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Wed, 26 Oct 2011 13:29:59 +0000 (15:29 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 26 Oct 2011 13:29:59 +0000 (15:29 +0200)

Trivial merge