rake db:test:prepare doesn't work as I'm used to on branch 2-1-stable

Hi,

I'm using rails' 2-1-stable branch from github since it includes some
fixes I need.
When I'm using rake db:test:prepare, I don't get an up-to-schema test
database.
Instead it seems to just re-build my development database, dropping
all data in it.

It seems b6d0eba5790552f4c9ef6a1abe0befd8be454ada is the commit that
changed this behavior.

So should I use RAILS_ENV=test rake db:test:prepare from now on? or is
this just a small bug?
To me, db:test:prepare implies it's gonna use the testing-db anyways.

Thanks,
Mathijs