Merge branch 'xorg/master' into xorg/f/surveys
authorStéphane Jacob <sj@m4x.org>
Mon, 6 Jun 2011 12:06:17 +0000 (14:06 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 6 Jun 2011 12:06:17 +0000 (14:06 +0200)

Trivial merge