[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Jul 2012 04:58:03 +0000 (10:28 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Jul 2012 04:58:03 +0000 (10:28 +0530)
bzr revid: apa@tinyerp.com-20120730045803-ebbbyzawkgldul09


Trivial merge