Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 28 Dec 2010 21:20:06 +0000 (22:20 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Tue, 28 Dec 2010 21:20:06 +0000 (22:20 +0100)
commit2d89ec936167033886ae76b153605d7ccf19bc20
tree3bd6eac950c54a4b2447d414adf245ee658524d6
parent691999782d434e5d55380cd2b1f35fc9cf9ada8e
parent5f0ac25ee1e92a8344859d08bb6d706dc4d5d49d
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master