[merge]
authorHarry (OpenERP) <hmo@tinyerp.com>
Tue, 21 Aug 2012 05:14:29 +0000 (10:44 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Tue, 21 Aug 2012 05:14:29 +0000 (10:44 +0530)
bzr revid: hmo@tinyerp.com-20120821051429-603c2m8qnupopllq


Trivial merge