manual merge of akka branch, and rm svn - questions about WikiProcessor.java in comments on that file