[MERGE] merged with main addons
authorBharat Devnani (OpenERP) <bde@tinyerp.com>
Mon, 23 Jan 2012 06:54:54 +0000 (12:24 +0530)
committerBharat Devnani (OpenERP) <bde@tinyerp.com>
Mon, 23 Jan 2012 06:54:54 +0000 (12:24 +0530)
bzr revid: bde@tinyerp.com-20120123065454-t61gd3bdhje1q7kt


Trivial merge