Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 19:44:54 +0000 (21:44 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 19:44:54 +0000 (21:44 +0200)

Trivial merge