Merge changes from the RForge svn repo.
Writing my last name hyphenated everywhere.