test commit; experimenting w/ svnmerge
Authored by: jdh2358 2010-07-06
Parent: [r8506]
Child: [r8508]
