[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 13 Feb 2012 16:21:45 +0000 (17:21 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 13 Feb 2012 16:21:45 +0000 (17:21 +0100)
bzr revid: nel@tinyerp.com-20120213162145-j91bf9xk76202gvr


Trivial merge