Another off the shelve solution that does not involve soldering is the iGo USB Charging Cable coupled with the A97 power tip. Works with every USB source that I tried. It looks like it does the shortening of the data pins only on the tip side, so you can even use it to charge from a PC without messing its USB bus.
They're maemo and MeeGo... "Meamo!" sounds like what Zorro would say to catherine zeta jones... after she slaps him for looking at her dirtily...