[MERGE] merge with mdi branch to get all the changes specified on pad
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Mon, 26 Mar 2012 13:18:13 +0000 (18:48 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Mon, 26 Mar 2012 13:18:13 +0000 (18:48 +0530)
bzr revid: psi@tinyerp.com-20120326131813-7gv5lsuhzh50odep


Trivial merge