[MERGE] Merged from Parent branch
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Mon, 25 Jul 2011 09:55:45 +0000 (15:25 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Mon, 25 Jul 2011 09:55:45 +0000 (15:25 +0530)
bzr revid: jvo@tinyerp.com-20110725095545-1b50dp25qfllwia6


Trivial merge