Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 10 Jun 2012 16:38:13 +0000 (18:38 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 10 Jun 2012 16:38:13 +0000 (18:38 +0200)

Trivial merge