[MERGE] Merged:trunk-dev-addons2
authorron@tinyerp.com <>
Fri, 29 Oct 2010 08:08:01 +0000 (13:38 +0530)
committerron@tinyerp.com <>
Fri, 29 Oct 2010 08:08:01 +0000 (13:38 +0530)
bzr revid: ron@tinyerp.com-20101029080801-i3fw1742zjd7kidn


Trivial merge