As a note: With the upgrade of the subversion server at IU to v1.6.3,
the Open MPI repository was also updated. This means that developers
(with appropriate access) should be able to take advantage of the new
merge features of subversion. I have not tried it out yet, but if
anyone does, let us know how it goes.