the replacement placeholder is wrong in router add interface feature when subnet overlaps

[yong sheng gong]

                    if match1 or match2:
                        msg = (_("Cidr %(subnet_cidr)s of subnet "
                                 "%(subnet_id)s overlaps with cidr %(cidr)s "
                                 " of subnet %(sub_id)") % locals()) -> %(sub_id)s
                        raise q_exc.BadRequest(resource='router', msg=msg)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/19066

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/19066
Committed: http://github.com/openstack/quantum/commit/5f0aead4e4c42f16b0f32870bd7fa952d219945b
Submitter: Jenkins
Branch: master

commit 5f0aead4e4c42f16b0f32870bd7fa952d219945b
Author: gongysh <email address hidden>
Date: Mon Jan 7 09:52:29 2013 +0800

    Fix the replacement placeholder in string

    Bug #1096721

    Change-Id: Ief6f410e4532772af3f9775b48ce92ac901f812d