[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)
commiteaeb137baa8dd09643099a6db0642a4ee8dd4b7a
tree278ce1bb20ffa43a701f03453035658b3655eff5
parent0e8f647e67d1b01ef6a617fde38d2013356770a4
parent34b298f52d9a02c3c25bb959a1d0ba71a0c38f9f
[MERGE]: Merge with latest trunk-server

bzr revid: rpa@tinyerp.com-20120619071901-t3084xkit0cdkt9z