[MERGE]merge with parent branch
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Wed, 20 Jun 2012 06:31:34 +0000 (12:01 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Wed, 20 Jun 2012 06:31:34 +0000 (12:01 +0530)
bzr revid: sgo@tinyerp.com-20120620063134-box99a4hj4hobs1e


Trivial merge