Merge remote-tracking branch 'origin/gk' into gk

Conflicts:
	src/Cedar.6.0.ReSharper.user
	src/Cedar.suo
	src/Cedar/Data/CedarData.sdf
	src/Cedar/bin/Debug/Cedar.dll
	src/Cedar/bin/Debug/Cedar.pdb
	src/Cedar/bin/Debug/Data/CedarData.sdf
	src/Cedar/obj/Debug/Cedar.csproj.FileListAbsolute.txt
	src/Cedar/obj/Debug/Cedar.dll
	src/Cedar/obj/Debug/Cedar.pdb
	src/Cedar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	src/CedarTest/bin/Debug/Cedar.dll
	src/CedarTest/bin/Debug/Cedar.pdb
	src/CedarTest/bin/Debug/CedarTest.dll
	src/CedarTest/bin/Debug/CedarTest.pdb
	src/CedarTest/bin/Debug/Data/CedarData.sdf
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 13_39_32/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 13_53_56/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 14_34_03/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 14_35_27/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 14_55_21/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 14_57_15/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 14_58_15/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 14_59_57/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_17_57/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_19_09/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_20_15/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_23_56/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_25_54/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_26_33/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_27_14/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_28_02/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_28_20/Out/MySql.Data.dll
	src/CedarTest/bin/Debug/TestResults/prakashb_HCI-47 2012-03-13 15_29_55/Out/MySql.Data.dll
	src/CedarTest/obj/Debug/CedarTest.dll
	src/CedarTest/obj/Debug/CedarTest.pdb
	src/CedarTest/obj/Debug/ResolveAssemblyReference.cache
	src/IGD.Client/bin/Debug/Cedar.dll
	src/IGD.Client/bin/Debug/Cedar.pdb
	src/IGD.Client/bin/Debug/Data/CedarData.sdf
	src/IGD.Client/bin/Debug/IGD.Client.exe
	src/IGD.Client/bin/Debug/IGD.Client.pdb
	src/IGD.Client/obj/x86/Debug/IGD.Client.csproj.FileListAbsolute.txt
	src/IGD.Client/obj/x86/Debug/IGD.Client.exe
	src/IGD.Client/obj/x86/Debug/IGD.Client.pdb
	src/_ReSharper.Cedar/BuildScriptCache/.crc
	src/_ReSharper.Cedar/JbPdbInfo/019dbd152908c18b960f25ea5decee32687e8741
	src/_ReSharper.Cedar/JbPdbInfo/1b8d66ae0a704a830e7ed88a92c29c207ed8568a
	src/_ReSharper.Cedar/JbPdbInfo/627ac30e758bbbc68cef868a97883230c6f2d2e2
	src/_ReSharper.Cedar/NamedArguments/.crc
	src/_ReSharper.Cedar/NamedArguments/6/7881ae6.dat
	src/_ReSharper.Cedar/SymbolCache.bin
	src/_ReSharper.Cedar/TodoCache/.crc
	src/_ReSharper.Cedar/TodoCache/6/7881ae6.dat
	src/_ReSharper.Cedar/WordIndex/.crc
	src/_ReSharper.Cedar/WordIndex/6/7881ae6.dat
Merge remote-tracking branch 'origin/gk' into gk

Conflicts:
	src/log/TestLog.txt
change in strategy of cedar