Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 21 Jan 2011 19:36:28 +0000 (20:36 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Fri, 21 Jan 2011 19:36:28 +0000 (20:36 +0100)

Trivial merge