[MERGE]
authorNaresh Choksy <nch@tinyerp.com>
Wed, 19 Aug 2009 05:24:50 +0000 (10:54 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Wed, 19 Aug 2009 05:24:50 +0000 (10:54 +0530)
commit85a18df751bd3a600215d3ecbdcc9d0ab0819c9e
treefb60b6f219a542bea8634a61c5b7e68f7e68991a
parent36550b9ecaa490bd97b411b8a0c6d9a2932f2b78
parenteb15785f7b4128aa992558effc22e2b9193802d3
[MERGE]

bzr revid: nch@tinyerp.com-20090819052450-vs7okj45ogrjcl0j