[MERGE] Merged main branch
authorDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 09:34:36 +0000 (15:04 +0530)
committerDHS (OpenERP) <dhs@tinyerp.com>
Tue, 26 Oct 2010 09:34:36 +0000 (15:04 +0530)
commit6d3ed5f3dfd6833cda05d0bfa9f8a40457ecc36b
treef42d4462c6c1c60846f95eaec81d9557d384ee85
parent1a1197101fe74b49129818e5bd3cda42e80cad7f
parent8b1ef6ba2b0ac67cc4e63cab7f35a165dabf8e3a
[MERGE] Merged main branch

bzr revid: dhs@tinyerp.com-20101026093436-lxntznhfikv09akv