[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Fri, 24 Dec 2010 04:50:33 +0000 (10:20 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Fri, 24 Dec 2010 04:50:33 +0000 (10:20 +0530)
commit14286516c2d7fa8e9bbaee39e41efcb7a6765888
tree0508acd2952535cf70e78c11804ef7b57ebd4be9
parent9d7f2a25ea3b3904abd136552df32d7b9d944898
parent5304e5eb1a3c10a18dba1e6e7c1116ff041f1993
[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20101224045033-kwao734lfwb4ojd6