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)

Trivial merge