Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 16 Jun 2012 17:55:30 +0000 (19:55 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 16 Jun 2012 17:55:30 +0000 (19:55 +0200)

Trivial merge