[MERGE]
authorNajlaâ <nel@tinyerp.com>
Thu, 16 Feb 2012 11:51:24 +0000 (12:51 +0100)
committerNajlaâ <nel@tinyerp.com>
Thu, 16 Feb 2012 11:51:24 +0000 (12:51 +0100)
bzr revid: nel@tinyerp.com-20120216115124-7eugklbmm01it8rv


Trivial merge