merge
authorNajlaâ EL KHAYAT <nel@tinyerp.com>
Fri, 23 Jan 2009 11:28:23 +0000 (12:28 +0100)
committerNajlaâ EL KHAYAT <nel@tinyerp.com>
Fri, 23 Jan 2009 11:28:23 +0000 (12:28 +0100)
bzr revid: nel@tinyerp.com-20090123112823-iohbl4iq1giou0fx


Trivial merge