[MERGE]: Merge with latest trunk-server
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 13 Sep 2012 09:21:10 +0000 (14:51 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 13 Sep 2012 09:21:10 +0000 (14:51 +0530)
bzr revid: rpa@tinyerp.com-20120906091554-5bxo0p2smysoolp1
bzr revid: rpa@tinyerp.com-20120913092110-r1fwqrjgc6ehonar


Trivial merge