Melanie d3892bbd06 Merge branch 'master' into careminster ... Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs		2013-02-05 21:30:12 +00:00
..
SmartThreadPool	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00