[MERGE] Merged trunk.
authorJiten (OpenERP) <jra@tinyerp.com>
Mon, 17 Sep 2012 05:41:40 +0000 (11:11 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Mon, 17 Sep 2012 05:41:40 +0000 (11:11 +0530)
bzr revid: jra@tinyerp.com-20120917054140-oqthlws82kwoyhvn


Trivial merge