[MERGE]
authoreLBati <lorenzo.battistini@agilebg.com>
Fri, 25 Nov 2011 08:04:54 +0000 (09:04 +0100)
committereLBati <lorenzo.battistini@agilebg.com>
Fri, 25 Nov 2011 08:04:54 +0000 (09:04 +0100)
commit34f63179ef07144a92cc729b70030e82270a6148
treeea2db16d91be522ea2fc55351b2fa43d142ddcbf
parentdf961503e475aafbff3cb17be6b5117ea96e5851
parentb31cba394e59d89706a327517055dfd6192e1a83
[MERGE]

bzr revid: lorenzo.battistini@agilebg.com-20111125080454-335yirpepngeim3r