4e1c07cbf2
cmr=v1.7.5:reviewer=jsquyres:subject=handle non-matching addresses This commit was SVN r30719.
cmr=v1.7.5:reviewer=jsquyres:subject=handle non-matching addresses This commit was SVN r30719.