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)
commit86361a099429af6fa1910330067d6771cb76f839
treecff417a880ec3b707a960d4149923147a7b62ff0
parent1388db823ece82c1ed8a60ac72dd4641a117fcff
parenta2b84de0cda798157b3731216c0c86d36f7d31ae
Merge branch 'xorg/master' into xorg/f/surveys