[MERGE] merge mma branch
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Wed, 2 May 2012 13:20:42 +0000 (18:50 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Wed, 2 May 2012 13:20:42 +0000 (18:50 +0530)
bzr revid: psi@tinyerp.com-20120502132042-m6651mouhzjotqyi


Trivial merge