[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)
bzr revid: jas@tinyerp.com-20101022053805-1q4sfln7gfynagyc


Trivial merge