[Merge] Merged branch for the fix of lp:732613
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Fri, 11 Mar 2011 16:39:43 +0000 (22:09 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Fri, 11 Mar 2011 16:39:43 +0000 (22:09 +0530)
bzr revid: jvo@tinyerp.com-20110311163943-cg6zhr9eobvsbh15


Trivial merge