@jhilgeman also, look for cont...

@jhilgeman also, look for continuing merge improvements - have you tested SVN 1.6 yet?