Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Thu, 31 Mar 2011 20:39:07 +0000 (22:39 +0200)
committerStéphane Jacob <sj@m4x.org>
Thu, 31 Mar 2011 20:39:07 +0000 (22:39 +0200)

Trivial merge