need help merging the dont-save-plaintext-... branch into trunk

Hello,

can someone help me with merging the dont-save-plaintext-... branch
back into trunk?

This happens when I try to reintegrate the branch:

$ svn merge --reintegrate https://svn.collab.net/repos/svn/branches/dont-save-plaintext-passwords-by-default
subversion/libsvn_client/merge.c:5487: (apr_err=195016)
svn: Cannot reintegrate from 'https://svn.collab.net/repos/svn/branches/dont-save-plaintext-passwords-by-default' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
$ svn pg svn:mergeinfo
/branches/1.5.x-r30215:30238
/branches/diff-callbacks3:29985-30687
/branches/log-g-performance:30867-30958
/branches/svn-mergeinfo-enhancements:30045-30214
/branches/svnserve-logging:29754-30819

The mergeinfo on the branch is as follows:

$ svn pg svn:mergeinfo
/branches/1.5.x-r30215:30238
/branches/diff-callbacks3:29985-30687
/branches/log-g-performance:30867-30958
/branches/svn-mergeinfo-enhancements:30045-30214
/branches/svnserve-logging:29754-30819
/trunk:30654-31042

I don't see why it's giving me the error.
The mergeinfo is matching up just fine as far as I can tell.
I've synced up the branch to latest trunk, and there was no
commit between me doing the syncing and trying to merge.

What am I doing wrong?

Thanks,
Stefan

-- 
.sig free!