* Prebuild merged really badly - I think this may need some manual fixing yet.
This version is based on opensim rev 2992.