Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 19:44:54 +0000 (21:44 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 28 Mar 2011 19:44:54 +0000 (21:44 +0200)
commit4b79fe1c1096e933feb5fdba75cb8a99a6046fdb
treee0a869f07c0075f25d03409d3301ac8287442b65
parent3d964835e8ff04f0f86c80aea026b82896cb4a46
parent2adffe8ddcca5267e0ae621284de5b372d635537
Merge branch 'xorg/maint' into xorg/master