[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Tue, 31 Aug 2010 09:37:00 +0000 (15:07 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Tue, 31 Aug 2010 09:37:00 +0000 (15:07 +0530)
commit53ac6a299eb0112753547a2741fe5a699157ddf7
tree923b05e6f8d2b67a422aeaf3f530647422fa0720
parentf0d7dae0d75d9756c01495f674f52dac51cca454
parent408e7516d5e821c9ac98348add8d516379baae2b
[MERGE]

bzr revid: uco@tinyerp.com-20100831093700-2uzjcwjedo5271ty