[MERGE]
authorapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 04:32:03 +0000 (10:02 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 04:32:03 +0000 (10:02 +0530)
commitc18ad8cb8d494be5edb9c00d87deedb16d1c2d12
tree5320c836209f659ebf6d46da5deba481b755e665
parente4b1403e441dc59bb4038c141799efe5df03c90d
parent78ca098cf7fe60dc4b69a20ce0dcdbfd0919a84b
[MERGE]

bzr revid: apa@tinyerp.com-20101124043203-qsg4ps01l9gq2ume