Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Wed, 4 Jan 2012 22:47:51 +0000 (23:47 +0100)
committerStéphane Jacob <sj@m4x.org>
Wed, 4 Jan 2012 22:47:51 +0000 (23:47 +0100)
commit3eaeedd1621a4ad6f3b89b01dcab4143e6f27545
treeb3cfd4399489c9df8e92a01e5e60d223b3fb626d
parent1d7b946b9aa16c8c06b107b7510a19e6ec3c8398
parentac3ccae49e3cf675c21def1fe2963481d89f7c4b
Merge branch 'xorg/maint' into xorg/master