Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 15:57:09 +0000 (17:57 +0200)
committerStéphane Jacob <sj@m4x.org>
Sun, 3 Jun 2012 15:57:09 +0000 (17:57 +0200)
commitc124278e743b13724c99c08d890ea8cedaaf7534
tree964da91a960f9b34bdd2dba5a09445356182071c
parent2c61c11c0423be0be63cdac338fd6473a570f146
parent1f170710bd0814667fc73167f245e38086e360b6
Merge branch 'xorg/maint' into xorg/master