[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Fri, 7 Jan 2011 09:18:43 +0000 (14:48 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Fri, 7 Jan 2011 09:18:43 +0000 (14:48 +0530)
commit9e1e1de1858ed31deb9a0b2a304d0d7e81e29def
tree329c1edc3b83b69a375b75377f058d2f4c7a1f74
parentfc7d0dc7d2cdc1e050cdf5435500677cb9dca70a
parent75a74aa0a97058d681bc605f2dd3365fc820fbdd
[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20110107091843-s204puwrr2du50d3