[MERGE]
authorNajlaâ <nel@tinyerp.com>
Mon, 23 Jan 2012 16:47:20 +0000 (17:47 +0100)
committerNajlaâ <nel@tinyerp.com>
Mon, 23 Jan 2012 16:47:20 +0000 (17:47 +0100)
bzr revid: nel@tinyerp.com-20120123164720-4rfa1srdelc55c3x


Trivial merge