Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Conflicts:
	OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
0.7-release
Diva Canto 2010-06-19 09:02:36 -07:00
commit 2b76dba593

Diff Content Not Available