Bullet2 imported from SVN, with potential local changes