Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 13:04:50 +0000 (15:04 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 13:04:50 +0000 (15:04 +0200)

Trivial merge