[MERGE] Merged with latest trunk
authorAnand Patel (OpenERP) <pan@tinyerp.com>
Mon, 10 Dec 2012 08:41:22 +0000 (14:11 +0530)
committerAnand Patel (OpenERP) <pan@tinyerp.com>
Mon, 10 Dec 2012 08:41:22 +0000 (14:11 +0530)
commitb3ab5a63aeb81dab1618d909bc8832897bfa643c
treea1af9477f3197888d9b7663f15af40577ac3a2bc
parent52cd233b6a920293b051ce40f369b3e4227ccb02
parent798e44b1e4deb2730a94b616f3964fe98c6f66b8
[MERGE] Merged with latest trunk

bzr revid: pan@tinyerp.com-20121210084122-n7qyuh8hm6jvgmd9