Move the unordered library into 'branches' now that it has been accepted.
Update svnmerge information.
I think these versions have been merged...
Merge.
Fix some merge errors.