[MERGE]
authoreLBati <lorenzo.battistini@agilebg.com>
Sun, 25 Sep 2011 09:17:34 +0000 (11:17 +0200)
committereLBati <lorenzo.battistini@agilebg.com>
Sun, 25 Sep 2011 09:17:34 +0000 (11:17 +0200)
bzr revid: lorenzo.battistini@agilebg.com-20110925091734-90p05nvd6yvp8iz3


Trivial merge