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

Trivial merge