[MERGE] Merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 22 Jun 2010 08:44:32 +0000 (14:14 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Tue, 22 Jun 2010 08:44:32 +0000 (14:14 +0530)
commit7499f9039c150bd201d66df7ada0c28168decd60
tree589c0afd8dda31f256c78c76141f11b2d680f38a
parent6859ea7a553d6db944094ea849e1b42b2ba7abfe
parent353968d9f92e0ef0f901b88aa5f74258fb8076f9
[MERGE] Merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100622084432-1o23zvx7fw440tyk