really screwy merge trancking behavior, starting over

svn path=/branches/proto/v4.bak/wiki/; revision=44394
dead branch

svn path=/branches/proto/v4.bak/more/; revision=44405