[MERGE] merged with main addons
authorBharat Devnani (OpenERP) <bde@tinyerp.com>
Mon, 23 Jan 2012 05:27:57 +0000 (10:57 +0530)
committerBharat Devnani (OpenERP) <bde@tinyerp.com>
Mon, 23 Jan 2012 05:27:57 +0000 (10:57 +0530)
bzr revid: bde@tinyerp.com-20120123052757-6dwm7dqf9cx5uwsp


Trivial merge