[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)
commitedcb57a23100f1cfe754c1ffee6d4a959c69737e
tree6545b2ed784824eaad0773d2f2b3c17ca4e62ca7
parentcafc24d01979556badb7b7546478912c05cb4a0b
parentef26faf0a52ff74a6c58f60719bc9cb2a59114e5
[MERGE]: Merge with latest trunk-server

bzr revid: rpa@tinyerp.com-20120730052033-ssr1hzl5w4uir6u9
bzr revid: rpa@tinyerp.com-20120801050543-7zatwb8nuv6xzbc1
bzr revid: rpa@tinyerp.com-20120803045535-ldtsqdsesl0r1fet