git-svn: brown paper bag fixes