[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 09:35:17 +0000 (15:05 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 09:35:17 +0000 (15:05 +0530)
bzr revid: apa@tinyerp.com-20120320093517-p3v5pgl9hjs083ao


Trivial merge