discarded changes from branch that had the broken reindentation attempt
Thierry Parmentelat [Fri, 10 Jan 2014 10:14:03 +0000 (11:14 +0100)]

Trivial merge