[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Mon, 10 Jun 2013 05:01:45 +0000 (10:31 +0530)
committersgo@tinyerp.com <>
Mon, 10 Jun 2013 05:01:45 +0000 (10:31 +0530)
bzr revid: sgo@tinyerp.com-20130610050145-jk9ouqzz1rndfd51


Trivial merge