[MERGE]: Merge with latest trunk-server
authorRucha (Open ERP) <rpa@tinyerp.com>
Tue, 19 Jun 2012 07:19:01 +0000 (12:49 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Tue, 19 Jun 2012 07:19:01 +0000 (12:49 +0530)
bzr revid: rpa@tinyerp.com-20120619071901-t3084xkit0cdkt9z


Trivial merge