[MERGE]TRUNK.
authorVidhin Mehta <vme@tinyerp.com>
Mon, 28 Jan 2013 05:44:26 +0000 (11:14 +0530)
committerVidhin Mehta <vme@tinyerp.com>
Mon, 28 Jan 2013 05:44:26 +0000 (11:14 +0530)
bzr revid: vme@tinyerp.com-20130128054426-spazi5lweiqv59s8

1  2 
openerp/addons/base/res/res_country.py