From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 27 Jan 2012 10:36:57 +0000 (+0100)
Subject: merge master again (2.0-10 changelog only)
X-Git-Tag: sfa-2.1-1~5
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=862dfa7f7b8cce8c17e80c42aedd8d500ea86cb6

merge master again (2.0-10 changelog only)
---

862dfa7f7b8cce8c17e80c42aedd8d500ea86cb6