Merge branch 'v3.2'

Conflicts:
	src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
	src/DotNetOpenAuth.sln
	src/DotNetOpenAuth/OpenId/Provider/IProviderBehavior.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/IRelyingPartyBehavior.cs

1 files changed, 2 insertions, 0 deletions

diff --git a/samples/OpenIdProviderMvc/Controllers/HomeController.cs b/samples/OpenIdProviderMvc/Controllers/HomeController.cs
index 5ba08b3..fb03ce2 100644
--- a/samples/OpenIdProviderMvc/Controllers/HomeController.cs
+++ b/samples/OpenIdProviderMvc/Controllers/HomeController.cs
@@ -9,6 +9,7 @@
 	public class HomeController : Controller {
 		public ActionResult Index() {
 			if (Request.AcceptTypes.Contains("application/xrds+xml")) {
+				ViewData["OPIdentifier"] = true;
 				return View("Xrds");
 			}
 
@@ -21,6 +22,7 @@
 		}
 
 		public ActionResult Xrds() {
+			ViewData["OPIdentifier"] = true;
 			return View();
 		}
 	}