Fixed test.ini mismerge
Authored by: Jenny Steele 2010-05-17
Parent(s): [b6a8b7]
Child(ren): [af54c0]