merge
authorNajlaâ EL KHAYAT <nel@tinyerp.com>
Mon, 26 Jan 2009 11:58:37 +0000 (12:58 +0100)
committerNajlaâ EL KHAYAT <nel@tinyerp.com>
Mon, 26 Jan 2009 11:58:37 +0000 (12:58 +0100)
bzr revid: nel@tinyerp.com-20090126115837-negulrnr7dhm85jx


Trivial merge