Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 10 Jul 2011 21:45:02 +0000 (23:45 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 10 Jul 2011 21:45:02 +0000 (23:45 +0200)

Trivial merge