[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Mon, 1 Jul 2013 09:09:59 +0000 (14:39 +0530)
committersgo@tinyerp.com <>
Mon, 1 Jul 2013 09:09:59 +0000 (14:39 +0530)
commitdaec1fa0117348e91dffa0d2d7c669c9673ec5c4
treec8a1f9e2889cf81007efd1e2862e7f6fc73d2840
parentff73b066ed6adee1cd00b70241a17394d55f7436
parent447895839fd22fa610079a5b30f977b5b89b277d
[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130701090959-ddkktnp3asn6qqj1