[MERGE] Merged from Parent branch
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Tue, 7 Jun 2011 07:12:18 +0000 (12:42 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Tue, 7 Jun 2011 07:12:18 +0000 (12:42 +0530)
bzr revid: jvo@tinyerp.com-20110607071218-9izvo0x9jat0a332


Trivial merge