[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Fri, 10 Sep 2010 05:34:42 +0000 (11:04 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Fri, 10 Sep 2010 05:34:42 +0000 (11:04 +0530)
bzr revid: vir@tinyerp.com-20100909051517-n9i0wdpglaladklp
bzr revid: vir@tinyerp.com-20100910053442-3rsv5ihdmhhuzcyn


Trivial merge