[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 30 Jan 2012 12:29:36 +0000 (13:29 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 30 Jan 2012 12:29:36 +0000 (13:29 +0100)
bzr revid: nel@tinyerp.com-20120130122936-bnf530hdi8bf1hjp


Trivial merge