[MERGE] merged the dev branch with formatting of the addresses that depends on the...
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 1 Dec 2011 16:41:31 +0000 (17:41 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 1 Dec 2011 16:41:31 +0000 (17:41 +0100)
bzr revid: qdp-launchpad@openerp.com-20111201164131-8exdiwodwn631zq1


Trivial merge