Ha, Angelina Jolie's knickers did not arrive - there it your problem.
Actually I'm in China again which was a bit unexpected, and I'm a bit sick.
However, I've brought a board and usb debugger with me.
You can force it into 15K mode manually by adding a wire...
Tell you what, I'll try to do a "bodge" merge of the old code today.
Espen, mail me and I'll tell you how to do the 15K mod. However, the composite out won't work with this still.
If you are taking a laptop with you and micro usb cable you can update when you get there?
/Mike