Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Nov 2010 21:11:05 +0000 (22:11 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sat, 27 Nov 2010 21:11:05 +0000 (22:11 +0100)
commita56d07946f1a18c6615add3030fca02a55a34f57
tree74d93cb0945a58ce6876410fed96dc87f55dbc92
parent8d6bbca3841851c290b08eb902b456406a7264a0
parent7e5eebb9e2f1a0c60ca9827a3882d94e78c5a8f6
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master