Merge branch 'master' of https://github.com/fsharp/fsharpbinding

Conflicts:
	.gitignore
	Makefile.orig
	MonoDevelop.FSharpBinding/FSharpBinding.addin.xml
	MonoDevelop.FSharpBinding/FSharpInteractivePad.fs
	MonoDevelop.FSharpBinding/FSharpOptionsPanels.fs
	MonoDevelop.FSharpBinding/FSharpProjectFileNodeExtension.fs
	MonoDevelop.FSharpBinding/FSharpProjectServiceExtension.fs
	MonoDevelop.FSharpBinding/FSharpResourceIdBuilder.fs
	MonoDevelop.FSharpBinding/FSharpSyntaxMode.fs
	MonoDevelop.FSharpBinding/FSharpTextEditorCompletion.fs
	MonoDevelop.FSharpBinding/Gui/FSharpBuildOrderWidget.cs
	MonoDevelop.FSharpBinding/Gui/FSharpCompilerOptionsWidget.cs
	MonoDevelop.FSharpBinding/Gui/FSharpSettingsWidget.cs
	MonoDevelop.FSharpBinding/Gui/MonoDevelop.FSharp.Gui.csproj
	MonoDevelop.FSharpBinding/Gui/gtk-gui/MonoDevelop.FSharp.Gui.FSharpBuildOrderWidget.cs
	MonoDevelop.FSharpBinding/Gui/gtk-gui/MonoDevelop.FSharp.Gui.FSharpCompilerOptionsWidget.cs
	MonoDevelop.FSharpBinding/Gui/gtk-gui/MonoDevelop.FSharp.Gui.FSharpSettingsWidget.cs
	MonoDevelop.FSharpBinding/Gui/gtk-gui/generated.cs
	MonoDevelop.FSharpBinding/Gui/gtk-gui/gui.stetic
	MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj
	MonoDevelop.FSharpBinding/MonoDevelop.FSharp.sln
	MonoDevelop.FSharpBinding/PowerPack/CodeDomGenerator.fs
	MonoDevelop.FSharpBinding/PowerPack/CodeDomVisitor.fs
	MonoDevelop.FSharpBinding/PowerPack/CodeProvider.fs
	MonoDevelop.FSharpBinding/PowerPack/LazyList.fs
	MonoDevelop.FSharpBinding/PowerPack/LazyList.fsi
	MonoDevelop.FSharpBinding/Services/CompilerLocationUtils.fs
	MonoDevelop.FSharpBinding/Services/FSharpCompiler.fs
	MonoDevelop.FSharpBinding/Services/InteractiveSession.fs
	MonoDevelop.FSharpBinding/Services/LanguageService.fs
	MonoDevelop.FSharpBinding/Services/Mailbox.fs
	MonoDevelop.FSharpBinding/Services/Parser.fs
	MonoDevelop.FSharpBinding/icons/fsharp-file-icon.png
	MonoDevelop.FSharpBinding/icons/fsharp-icon-32.png
	MonoDevelop.FSharpBinding/icons/fsharp-icon.png
	MonoDevelop.FSharpBinding/icons/fsharp-project-icon.png
	MonoDevelop.FSharpBinding/icons/fsharp-script-32.png
	MonoDevelop.FSharpBinding/icons/fsharp-script-icon.png
	MonoDevelop.FSharpBinding/templates/EmptyFSharpScript.xft.xml
	MonoDevelop.FSharpBinding/templates/EmptyFSharpSource.xft.xml
	MonoDevelop.FSharpBinding/templates/FSharpConsoleProject.xpt.xml
	MonoDevelop.FSharpBinding/templates/FSharpLibraryProject.xpt.xml
	MonoDevelop.FSharpBinding/templates/FSharpSyntaxMode.xml
	addin-project.xml
	build/FSharp.MonoDevelop.fsproj
	build/FSharp.MonoDevelop.sln
	build/FSharpInteractivePad.fs
	build/FSharpLanguageBinding.fs
	build/FSharpOptionsPanels.fs
	build/FSharpParser.fs
	build/FSharpProjectFileNodeExtension.fs
	build/FSharpProjectServiceExtension.fs
	build/FSharpResolverProvider.fs
	build/FSharpResourceIdBuilder.fs
	build/FSharpSyntaxMode.fs
	build/FSharpTextEditorCompletion.fs
	build/Gui/FSharp.MonoDevelop.Gui.csproj
	build/Gui/FSharpBuildOrderWidget.cs
	build/Gui/FSharpCompilerOptionsWidget.cs
	build/Gui/FSharpSettingsWidget.cs
	build/Gui/gtk-gui/FSharp.MonoDevelop.Gui.FSharpBuildOrderWidget.cs
	build/Gui/gtk-gui/FSharp.MonoDevelop.Gui.FSharpCompilerOptionsWidget.cs
	build/Gui/gtk-gui/FSharp.MonoDevelop.Gui.FSharpSettingsWidget.cs
	build/Gui/gtk-gui/generated.cs
	build/Gui/gtk-gui/gui.stetic
	build/PowerPack/CodeDomGenerator.fs
	build/PowerPack/CodeDomVisitor.fs
	build/PowerPack/CodeProvider.fs
	build/PowerPack/LazyList.fs
	build/PowerPack/LazyList.fsi
	build/Resources/EmptyFSharpScript.xft.xml
	build/Resources/EmptyFSharpSource.xft.xml
	build/Resources/FSharpBinding.addin.xml
	build/Resources/FSharpConsoleProject.xpt.xml
	build/Resources/FSharpLibraryProject.xpt.xml
	build/Resources/FSharpSyntaxMode.xml
	build/Resources/fsharp-file-icon.png
	build/Resources/fsharp-icon-32.png
	build/Resources/fsharp-icon.png
	build/Resources/fsharp-project-icon.png
	build/Resources/fsharp-script-32.png
	build/Resources/fsharp-script-icon.png
	build/Services/Common.fs
	build/Services/CompilerLocationUtils.fs
	build/Services/CompilerService.fs
	build/Services/FSharpCompiler.fs
	build/Services/InteractiveSession.fs
	build/Services/LanguageService.fs
	build/Services/Mailbox.fs
	build/Services/Parameters.fs
	build/Services/Parser.fs
	configure.sh
	src/FSharp.MonoDevelop.fsproj
	src/FSharp.MonoDevelop.sln
	src/FSharpInteractivePad.fs
	src/FSharpOptionsPanels.fs
	src/FSharpProjectFileNodeExtension.fs
	src/FSharpProjectServiceExtension.fs
	src/FSharpResourceIdBuilder.fs
	src/FSharpSyntaxMode.fs
	src/FSharpTextEditorCompletion.fs
	src/Gui/FSharp.MonoDevelop.Gui.csproj
	src/Gui/FSharpBuildOrderWidget.cs
	src/Gui/FSharpCompilerOptionsWidget.cs
	src/Gui/FSharpSettingsWidget.cs
	src/Gui/gtk-gui/FSharp.MonoDevelop.Gui.FSharpBuildOrderWidget.cs
	src/Gui/gtk-gui/FSharp.MonoDevelop.Gui.FSharpCompilerOptionsWidget.cs
	src/Gui/gtk-gui/FSharp.MonoDevelop.Gui.FSharpSettingsWidget.cs
	src/Gui/gtk-gui/generated.cs
	src/Gui/gtk-gui/gui.stetic
	src/PowerPack/CodeDomGenerator.fs
	src/PowerPack/CodeDomVisitor.fs
	src/PowerPack/CodeProvider.fs
	src/PowerPack/LazyList.fs
	src/PowerPack/LazyList.fsi
	src/Resources/EmptyFSharpScript.xft.xml
	src/Resources/EmptyFSharpSource.xft.xml
	src/Resources/FSharpBinding.addin.xml
	src/Resources/FSharpConsoleProject.xpt.xml
	src/Resources/FSharpLibraryProject.xpt.xml
	src/Resources/FSharpSyntaxMode.xml
	src/Resources/fsharp-file-icon.png
	src/Resources/fsharp-icon-32.png
	src/Resources/fsharp-icon.png
	src/Resources/fsharp-project-icon.png
	src/Resources/fsharp-script-32.png
	src/Resources/fsharp-script-icon.png
	src/Services/CompilerLocationUtils.fs
	src/Services/FSharpCompiler.fs
	src/Services/InteractiveSession.fs
	src/Services/LanguageService.fs
	src/Services/Mailbox.fs
	src/Services/Parser.fs