CVS duplicate key violation fix (#996, #1098).
Authored by: jplang 2008-04-24
Parent: [r1354]
Child: [r1356]