I now have 2 version of the merge..
First usng mart's modified auth_fields_2 function to link to uploadpic.bml (here)
Second one is using the current ?authas= schema (here)
I think i've covered just about everything to date, problems and new patches.
Let me know if anything else comes up.
(as always, test at http://lj.halkeye.net/ with the test account)