Hardcoded versions from the latest svn build
Changes from the latest svn release, mostly whitespace....not sure how these were missed.