Merged some .subversion config stuff from sandbox VM