Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes

This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy
Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead.  Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/.nant/local.include b/.nant/local.include
index 94398a2..3db063b 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -7,8 +7,8 @@
 <property name="distbindir" value="distbin" />
 <target name="distbin">
   <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/>
+  <copy file="bin/config-include/StandaloneCommon.ini.example" tofile="bin/config-include/StandaloneCommon.ini"/>
   <delete dir="${distbindir}"/>
-  <!-- <copy file="*" todir="${distbindir}"/> -->
   <copy todir="${distbindir}">
     <fileset>
       <include name="**"/>