Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 3 Apr 2011 12:43:56 +0000 (14:43 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 3 Apr 2011 12:43:56 +0000 (14:43 +0200)

Trivial merge