[MERGE] merge with mdi branch
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 3 Apr 2012 12:33:19 +0000 (18:03 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 3 Apr 2012 12:33:19 +0000 (18:03 +0530)
bzr revid: psi@tinyerp.com-20120403123319-ae5sl9rjfqljqqoi


Trivial merge