Brings us to the top of the PHPUnit 3.5 branch

TEST!
Merge pull request #3 from fanquake/PHPUnit-3.5-Merge

Brings us to the top of the PHPUnit 3.5 branch