Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 29 Mar 2011 19:35:10 +0000 (21:35 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 29 Mar 2011 19:35:10 +0000 (21:35 +0200)
commitd47dc66aaefe08eb4a8e65888dd499d85a6beb55
tree8ddcd3ebc214d2ffd92b186523674de66b172d95
parent2b693e58527566799e8468e2dc315cfe775207ea
parent40324482ba301d7ed9a56ef0fc2d4391dbaf871b
Merge branch 'xorg/maint' into xorg/master