[MERGE] merge from trunk addons3
authorpso <pso@tinyerp.com>
Thu, 6 Jan 2011 05:27:08 +0000 (10:57 +0530)
committerpso <pso@tinyerp.com>
Thu, 6 Jan 2011 05:27:08 +0000 (10:57 +0530)
commita63eaf7d9a22e6896a5d9481d5ca2a195bdb7caa
tree08e69cb8a3b1fab9d2808cd7640c1c050c509988
parentc9eb18ea898b10eb130479c9aa0fe5dd5540935a
parentb8c07487438bf992caeee77866ed4d1dcd7ae165
[MERGE] merge from trunk addons3

bzr revid: pso@tinyerp.com-20110106052708-4ywi0tgtjyre5qpi