merges
authorNaresh Choksy <nch@tinyerp.com>
Fri, 24 Oct 2008 09:19:05 +0000 (14:49 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Fri, 24 Oct 2008 09:19:05 +0000 (14:49 +0530)
commit54651e2f34af1412df5ab5d3e371bdc4d0600b23
tree451627fba63bf377e59837510a4125edee6ab320
parent7944cb8cfbe6be67147be5e81522418b048b3cd6
parent6ecdbc0e9d4342d955a9bf930e9aef10811e15ce
merges

bzr revid: nch@tinyerp.com-20081024091905-978fasyj2f4mo2lb