[MERGE] Merged with lp:~trunk-dev-addons2
authorron@tinyerp.com <>
Thu, 21 Oct 2010 06:01:38 +0000 (11:31 +0530)
committerron@tinyerp.com <>
Thu, 21 Oct 2010 06:01:38 +0000 (11:31 +0530)
commit76356d6c5816a1d7e171ad6e060f3987d7965d5c
tree490c1b7b2a8afef9311b7811300538e6e82d3170
parent6729bd6cd293629337f0dd8f430f67e192696524
parent990467492dabbf2912ca56fb81e6507873c05441
[MERGE] Merged with lp:~trunk-dev-addons2

bzr revid: ron@tinyerp.com-20101021052639-aww3pqjqd84koypd
bzr revid: ron@tinyerp.com-20101021060138-3j1lgjklpp7hdz3b