[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 23 Aug 2012 05:03:24 +0000 (10:33 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 23 Aug 2012 05:03:24 +0000 (10:33 +0530)
bzr revid: apa@tinyerp.com-20120823050324-aurzeooip3j5ogxc


Trivial merge