merge
authorNajlaâ EL KHAYAT <nel@tinyerp.com>
Thu, 22 Jan 2009 12:50:10 +0000 (13:50 +0100)
committerNajlaâ EL KHAYAT <nel@tinyerp.com>
Thu, 22 Jan 2009 12:50:10 +0000 (13:50 +0100)
bzr revid: nel@tinyerp.com-20090122125010-q04mscyuw2zxehnv


Trivial merge