[MERGE] Merge with main branch
authorpso (OpenERP) <pso@tinyerp.com>
Tue, 7 Aug 2012 07:14:31 +0000 (12:44 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Tue, 7 Aug 2012 07:14:31 +0000 (12:44 +0530)
commit0b1ef02059b1027f7cb4870c74aa9b21e08a72a7
treee5d77651cc04b1e9ef1a79a93359f832be3ba511
parente223851436cffd5ae521420f17506822d7157c45
parentc3d3d2683c879ce952555ff2648af041dc67325f
[MERGE] Merge with main branch

bzr revid: pso@tinyerp.com-20120731104801-i601dx1qi5iibdpb
bzr revid: pso@tinyerp.com-20120807071431-y0y1osbtd2doqfyu
openerp/addons/base/__openerp__.py
openerp/addons/base/res/res_country_view.xml