merges
authorNaresh Choksy <nch@tinyerp.com>
Tue, 2 Sep 2008 12:14:27 +0000 (17:44 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Tue, 2 Sep 2008 12:14:27 +0000 (17:44 +0530)
commit876cb904bb15a6eb9ce9b3bf8e4526b4691c0422
tree542bc307981c7f3a336fa3d0642aa8185a65c201
parent673c5700f86db0219a965db3da552a1014e30a0c
parent51fe0efd169cb022102f8734536f6075fce5a1b5
merges

bzr revid: nch@tinyerp.com-20080902121427-hny1wwl1bbzmi2qz