[MERGE] merged l10n_us branch
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 6 Jan 2012 13:35:48 +0000 (14:35 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 6 Jan 2012 13:35:48 +0000 (14:35 +0100)
commit8195d3a7c453ff1aab41cc3d989c0c6e5eb3bb26
treed366cd930b96992fb264f9cfde3c0117b66ec51d
parent9099fca5f6f7d209cdb7652937b1d7393a6c188f
parentca98b4a23575d6125962f19ed4ea93956a37e3c9
[MERGE] merged l10n_us branch

bzr revid: qdp-launchpad@openerp.com-20120106133548-tfucrzf9rz1obqyy