Comment 3 for bug 885425

I managed to pull in most of the changes in trunk by manually merging it with revision 38, even though I still don't really know much about Pyrex.

My biggest concern is with btOverlappingPairCache, because both trunk and rev 38 of the vehicles branch implemented different parts of it, and when I attempted to combine them, bullet.pyx stopped compiling again.

Right now, most of the demos and test files seem to work in a way similar to those in trunk.