Merge branch 'xorg/maint' into xorg/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 9 Sep 2011 22:35:10 +0000 (00:35 +0200)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 9 Sep 2011 22:35:10 +0000 (00:35 +0200)
commit173ff0bdf41db90ee0995e0c3bf844bf2151d0e6
tree6b84a640086259a2b4a0b4e7eea1dab46e38922e
parent744ae57cd44f6b7add703de1c7a46d7f73f9ccb8
parentec35cec0a7b2b2a1cfb3adf099adbe1bfb1a5cb2
Merge branch 'xorg/maint' into xorg/master