Testing: Merged to trunk. Closing the branch.
Authored by: ecarter 2008-04-05
Parent: [r6805]
Child: [r6807]