[MERGE] Merged trunk.
authorJiten (OpenERP) <jra@tinyerp.com>
Mon, 22 Oct 2012 06:02:08 +0000 (11:32 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Mon, 22 Oct 2012 06:02:08 +0000 (11:32 +0530)
bzr revid: jra@tinyerp.com-20121016054150-3wk2tozq98u83kuk
bzr revid: jra@tinyerp.com-20121018060228-4th3uexqp9cks3xx
bzr revid: jra@tinyerp.com-20121019055038-pr1jz3u01hi0qjfq
bzr revid: jra@tinyerp.com-20121022060208-5fd962drv61gnu2j


Trivial merge