[MERGE]:lp:~openerp-dev/openobject-addons/trunk-purchase-topbar-kjo
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:48:47 +0000 (16:18 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 26 Apr 2012 10:48:47 +0000 (16:18 +0530)
bzr revid: apa@tinyerp.com-20120426104847-jm202uwi9trmtfam


Trivial merge