Merge remote branch 'origin/master' into xorg/f/surveys xorg/f/surveys
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 19 Jun 2011 15:27:21 +0000 (17:27 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 19 Jun 2011 15:27:21 +0000 (17:27 +0200)

Trivial merge