I thought you had it, but it was already set like that. I guess the updated firmware did it for me, because I know I didn't set it that way. I tried setting extras-testing like that, but I got a 404 not found error. So as it is now, and was before:

Catalog name: maemo.org
Web address: http://repository.maemo.org/extras/
Dist.: fremantle-1.2
Components: free non-free
(disabled not checked)

maemo-testing looks similar:
Address .../extras-testing/
Dist.:fremantle (adding 1.2 gives an error, I copy pasted it from extras to be sure I didn't typo it)

I had hoped it would be a nice easy fix like that, but I guess its something else.

Thanks,
Jason