Merge branch 'xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Thu, 7 Jul 2011 08:47:55 +0000 (10:47 +0200)
committerStéphane Jacob <sj@m4x.org>
Thu, 7 Jul 2011 08:47:55 +0000 (10:47 +0200)
commit8e202451b08f0e0fc38d180d4b7cf33328ec8290
treea9a2e9f5ed5ef28d9a3e26c405554cecebd2e882
parentd080790d2bbf427127d83607a6f15718c9a19d3b
parent20d37dc0215a330bbbe00ba2b97d6b61624a225a
Merge branch 'xorg/maint' into xorg/master