[MERGE]:Merged from trunk
authorapa-tiny <apa@tinyerp.com>
Fri, 24 Sep 2010 04:55:28 +0000 (10:25 +0530)
committerapa-tiny <apa@tinyerp.com>
Fri, 24 Sep 2010 04:55:28 +0000 (10:25 +0530)
commit1f2685f7c6d36cfa82074d992a67c90848cc228e
tree62507399e69d3057451de09398360fa19a395669
parentf9c5e2f7504b83bf5e5091705f68a280aa41bb41
parent801f339f0a6bc9c86d04a6d5d8248bb2937239d6
[MERGE]:Merged from trunk

bzr revid: apa@tinyerp.com-20100924045528-zgmlmd1n2fvetyxw