Fixed svn merge issues
2 files changed