Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 4 Apr 2011 14:36:41 +0000 (16:36 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 4 Apr 2011 14:36:41 +0000 (16:36 +0200)

Trivial merge