Dan Lake 1091001cf6 Merge branch 'master' into dev ... Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs		2011-07-25 16:08:00 -07:00
..
Caps	Merge branch 'master' into dev	2011-07-20 14:35:06 -07:00
UDP	Merge branch 'master' into dev	2011-07-25 16:08:00 -07:00