merge
authorNaresh Choksy <nch@tinyerp.com>
Mon, 15 Dec 2008 04:48:03 +0000 (10:18 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Mon, 15 Dec 2008 04:48:03 +0000 (10:18 +0530)
commit4e9158e307367946453b4617307418395abcb540
treef41a211e95b496b1099f0889abdfdcf4117bba40
parent818bfe81264938736dfde070358c21fdd229e73c
parentbb507de5b9103257059ba05bf6539539e470bea7
merge

bzr revid: nch@tinyerp.com-20081215044803-0hb2hl9jeznzz5fa