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)
commite9f4dfaec1639c75ab187fba5f59aab7ecf87fe3
tree946eab8a871e065a9be4a0729a68400ec433d93f
parent86361a099429af6fa1910330067d6771cb76f839
parent9f4004f361f8d8654c0c0c7dd14d4dee616d1f8c
Merge branch 'xorg/master' into xorg/f/surveys