Bug 1124212

Corrected line endings, should merge now