Merge branch 'core/1.1.3/maint' into core/master
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 7 Apr 2011 20:17:51 +0000 (22:17 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Thu, 7 Apr 2011 20:17:51 +0000 (22:17 +0200)

Trivial merge