Merge from trunk 16122-16307

CMake/macros.cmake

CMakeLists.txt

...rc/BulletCollision/CollisionDispatch/btCollisionWorld.cpp

.../src/BulletCollision/CollisionDispatch/btCollisionWorld.h

...ulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp

.../BulletCollision/NarrowPhaseCollision/btRaycastCallback.h

...2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp

intern/guardedalloc/BLO_sys_types.h

intern/guardedalloc/intern/mallocn.c

intern/guardedalloc/intern/mmap_win.c

intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj

intern/guardedalloc/mmap_win.h

intern/opennl/make/msvc_7_0/opennl.vcproj

intern/opennl/superlu/BLO_sys_types.h

intern/opennl/superlu/smemory.c

projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj

projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj

projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj

...meengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj

projectfiles_vc7/kernel/system/SYS_system.vcproj