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)
commitc813c88cc1309c4ae7a45a14504623b023915265
tree0760dafe6ebffea92cbb7422ee8979cc5da378bb
parenta3b85837294fe4193a6a7791c4d5f30315707272
parent7fe3498f5eb88cf871e3fd32cfbf92bb3944c8be
merge

bzr revid: nel@tinyerp.com-20090122125010-q04mscyuw2zxehnv