Melanie f567ff9f51 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-02-06 02:22:12 +00:00
..
Interfaces	Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs.	2013-01-23 23:38:08 +00:00
Shared	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
XEngine	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00