Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Mon, 12 Dec 2011 11:45:49 +0000 (12:45 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 12 Dec 2011 11:45:49 +0000 (12:45 +0100)
commitc65aed9897893d27bc93744c801d289724ef5b7b
tree95c819c80c8146b8fa483b773fe1ceb671020f50
parent001ef7efc781fb97019478b49200aced4bfcf8c8
parent561818ebeb14788a6af2f88f320b6e17b08ff373
Merge branch 'xorg/maint' into xorg/master