[MERGE] merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Fri, 26 Mar 2010 04:35:42 +0000 (10:05 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Fri, 26 Mar 2010 04:35:42 +0000 (10:05 +0530)
commit777ada234e20ede59cb8cbb383092b6a8f1222f7
tree62511748167a1b3b3c51b2c59fc413a1d7c67bb1
parent3c61bb73b8593630114ec9d1e656342f29ba5f24
parentb170ef94fccb34765bc4acec66e4659a24ce1753
[MERGE] merge with main branch

bzr revid: mra@tinyerp.com-20100326043542-4ltod5iachq4o419