Melanie fd22159d0c Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Framework/Watchdog.cs

2011-10-26 01:27:24 +01:00

..

CapabilitiesModule.cs

Merge branch 'master' into bigmerge

2011-10-26 01:27:24 +01:00