[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 11:01:23 +0000 (16:31 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 20 Mar 2012 11:01:23 +0000 (16:31 +0530)
bzr revid: apa@tinyerp.com-20120320110123-iuebl27n5pafguv0


Trivial merge