merge
authorNajlaâ EL KHAYAT <nel@tinyerp.com>
Mon, 26 Jan 2009 12:17:33 +0000 (13:17 +0100)
committerNajlaâ EL KHAYAT <nel@tinyerp.com>
Mon, 26 Jan 2009 12:17:33 +0000 (13:17 +0100)
bzr revid: nel@tinyerp.com-20090126121733-pp2tq2bnh069dgrs


Trivial merge