[MERGE] merged with trunk-dev-addons2
authorjas <jas@tinyerp.com>
Fri, 22 Oct 2010 05:38:05 +0000 (11:08 +0530)
committerjas <jas@tinyerp.com>
Fri, 22 Oct 2010 05:38:05 +0000 (11:08 +0530)
commitd9273d2a47d5b927a545d6545d7154bac70466c9
treec4129ca5193d2fef4428f2389d9afcad1af49c75
parentfe7a5d6946a613511239ad6ea9679df4f80f1896
parent511373a4bd206413efe2dc10bb2d9d02100acca6
[MERGE] merged with trunk-dev-addons2

bzr revid: jas@tinyerp.com-20101022053805-1q4sfln7gfynagyc