Same here. I used the manual install and have since used upgrade route on a new install.

I had trouble installing the python2.5 environment in scratchbox. The solution turned out to be including the diablo extras-devel repository in /etc/apt/sources.list and running

fakeroot apt-get update
fakeroot apt-get install maemo-python-env

Here are the extra lines for /etc/apt/sources.list:

deb http://repository.maemo.org/extras diablo free non-free
deb http://repository.maemo.org/extras-devel diablo free non-free