Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 16 Apr 2011 22:00:04 +0000 (00:00 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 16 Apr 2011 22:00:04 +0000 (00:00 +0200)

Trivial merge