% svn merge -r 5321:head ../drjava
--- Merging r5328 through r5330 into '.':
U src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java
U src/edu/rice/cs/drjava/ui/RecentFileManager.java
U src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
_M .
M src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java
M src/edu/rice/cs/drjava/ui/RecentFileManager.java
M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java