Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:09:39 +0000 (21:09 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 16 Dec 2010 20:09:39 +0000 (21:09 +0100)
commitcafb410fea6f257f45da08631c6cdb5c35f86b17
tree3cb5501be68c98f978386f52b508d013bb3b99b4
parent551e00c175feb8f3511c603f8871b70900f461ef
parentd2c8403423117200d8eadc963ec58d3f8a3bd1ab
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master