[MERGE]
authorNaresh Choksy <nch@tinyerp.com>
Fri, 24 Jul 2009 04:59:57 +0000 (10:29 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Fri, 24 Jul 2009 04:59:57 +0000 (10:29 +0530)
commit5477f35dd706bb4f61d2848791cd7d0e24c97400
tree0b6aef503f5bcce1df93cb469d3552a83896a7a4
parent034f8a3c1012b640ff59de43658ccb335aee4f26
parent0a507f6edfcc373412e7c491dbba2efeb0759841
[MERGE]

bzr revid: nch@tinyerp.com-20090724045957-ko4k8gljcntzm7e2