[MERGE]
authorBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 4 Mar 2011 05:49:50 +0000 (11:19 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 4 Mar 2011 05:49:50 +0000 (11:19 +0530)
commit74a80241ba0b0d4be873c08edb93cc1b3bed660e
tree2f424503ce84c761efc519f3f35b3bfb07018248
parent8950355ec711bdbdfb9e68674419b623ff159ba7
parent9010e4adae4e524417c0b45d238526a758ac5f25
[MERGE]

bzr revid: sbh@tinyerp.com-20110304054950-k0xeuyqrome7e318