[Merge]
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Wed, 22 Jun 2011 20:07:47 +0000 (01:37 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Wed, 22 Jun 2011 20:07:47 +0000 (01:37 +0530)
bzr revid: jvo@tinyerp.com-20110622200747-jrzhme1tcdrw7p83


Trivial merge