[MERGE] merge with main branch
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Fri, 20 Jul 2012 06:15:20 +0000 (11:45 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Fri, 20 Jul 2012 06:15:20 +0000 (11:45 +0530)
commit7a8ac01d31bad4fbf4d9c76c11c9b7cdb5be2498
tree58f5f543040b25c190f5f8e3eaf85b50e06ff323
parentf186ff2145ace3b47827f204de83304dc59391f6
parent7df568d138348aa00be74340d2c5d408dd239da6
[MERGE] merge with main branch

bzr revid: psi@tinyerp.com-20120720061520-fzq1vhfyn88z8q3d
addons/account/account.py
addons/mrp/mrp.py