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)

Trivial merge