From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Fri, 18 Nov 2011 16:38:34 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~274
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=19dff4d49e0bf51857903d759947d0a1b01229a4

Merge branch 'master' into senslab2

Conflicts:
	sfa/util/xml.py
---

19dff4d49e0bf51857903d759947d0a1b01229a4