Merge branch 'master' into model_start model_start
authorSébastien CHAZALLET <s.chazallet@gmail.com>
Tue, 6 Nov 2012 08:51:01 +0000 (09:51 +0100)
committerSébastien CHAZALLET <s.chazallet@gmail.com>
Tue, 6 Nov 2012 08:51:01 +0000 (09:51 +0100)

Trivial merge