Melanie cc4cfd9fa8 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs		2013-01-23 02:38:59 +00:00
..
SmartThreadPool	Merge branch 'master' into careminster	2013-01-23 02:38:59 +00:00