We've actually done a merge. It is complete. All committed changes on the leo-ctx5 branch are now on trunk as of rev 9260. The leo-ctx5 branch was deleted as rev 9261.
If you have any checkouts of the leo-ctx5 branch, you will need to
switch them to trunk
cd parrot-checkout-of-leo-ctx5-branch
svn switch https://svn.perl.org/parrot/trunk/
-R
