Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 10:41:04 +0000 (12:41 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 10:41:04 +0000 (12:41 +0200)

Trivial merge