Merge remote branch 'origin/xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sat, 2 Apr 2011 15:52:51 +0000 (17:52 +0200)
committerStéphane Jacob <sj@m4x.org>
Sat, 2 Apr 2011 15:52:51 +0000 (17:52 +0200)

Trivial merge