[MERGE]
authoruco (OpenERP) <uco@tinyerp.com>
Fri, 15 Oct 2010 05:07:36 +0000 (10:37 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Fri, 15 Oct 2010 05:07:36 +0000 (10:37 +0530)
commitd226645fbc5d605ae01cdfe43ab5ba07551e3fb1
tree9b402db6a0f72440493002aa8c8c191d07586199
parentc7faee01f5dc2d52a5fe4764c0f65e51130082b7
parent391fe7dbb1e5c02c3feb23f203075394f2b07ff1
[MERGE]

bzr revid: uco@tinyerp.com-20101015050736-hqz9hhsv93tn5gqk