[MERGE] merge from trunk addons3
authorpso <pso@tinyerp.com>
Fri, 10 Dec 2010 11:24:50 +0000 (16:54 +0530)
committerpso <pso@tinyerp.com>
Fri, 10 Dec 2010 11:24:50 +0000 (16:54 +0530)
bzr revid: pso@tinyerp.com-20101210112450-dejshjdqt5madxh8


Trivial merge