Merge branch 'core/1.1.2/maint' into core/master
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 30 Jan 2011 22:46:40 +0000 (23:46 +0100)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Sun, 30 Jan 2011 22:46:40 +0000 (23:46 +0100)

Trivial merge