Converted to unix format
bug850572: Fixed merge conflict