Commit 2f1f2b7fc8395709f202dbe79c6ea8a5c00f4136

Colin 2012-01-13T00:27:03

Cleaned up whitespace on line endings.