merge bug26130 into default (again)

Author: michaelklishin

Makefile

@@ -34,7 +34,7 @@ ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}-wcf-service-model.pdf
 	file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc
-	file ${RELEASE_DIR}/${NAME_VSN}-dotnet-3.0.zip
+	file ${RELEASE_DIR}/${NAME_VSN}-dotnet-3.5.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-wcf-htmldoc.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-wcf-htmldoc
 	file ${RELEASE_DIR}/${NAME_VSN}.msi