[MERGE]: Merge with latest trunk
authorRucha (Open ERP) <rpa@tinyerp.com>
Wed, 2 Mar 2011 06:04:43 +0000 (11:34 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Wed, 2 Mar 2011 06:04:43 +0000 (11:34 +0530)
commit1a463e17688137fd2e5787a6b7e86534f689cc7c
tree57cef0a2d170d12507c9d572cfbc350d793e418e
parent5eb533a415f8e9738a81554cb4237597f1977485
parent0033dd0a59f09bfa55b61b42eea34214aab63dea
[MERGE]: Merge with latest trunk

bzr revid: rpa@tinyerp.com-20110302060443-raep8fb4504133m7