[MERGE]: Merge with latest trunk-server
authorRucha (Open ERP) <rpa@tinyerp.com>
Fri, 3 Aug 2012 04:55:35 +0000 (10:25 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Fri, 3 Aug 2012 04:55:35 +0000 (10:25 +0530)
bzr revid: rpa@tinyerp.com-20120730052033-ssr1hzl5w4uir6u9
bzr revid: rpa@tinyerp.com-20120801050543-7zatwb8nuv6xzbc1
bzr revid: rpa@tinyerp.com-20120803045535-ldtsqdsesl0r1fet


Trivial merge