[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Mon, 11 Mar 2013 04:52:51 +0000 (10:22 +0530)
committersgo@tinyerp.com <>
Mon, 11 Mar 2013 04:52:51 +0000 (10:22 +0530)
commitb755da29b41abd95663be3c07a1f8c0d4311adc4
tree39ee86f94fe4029d405d3ef5fda7c4e8682f9e65
parentc82266840594850604010b25f7061c88fb48dff3
parentc867cb5acc731509fbee5b0e081c57d0aa374b5d
[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130311045251-fmvor3kqajhrx8uk