Future plans for OAuth 2 support in WIF by the black labrador

I have looked at the ACS/OAuth 2 sample and got it to work with no problems but it seems to be a bit inconsistent with the WS-Federation approach used in the existing RTM WIF. In particular, would have expected to have a mirror of the WSFederationAuthenticationModule and SessionAuthenticatonModule from WIF. The sample has an OAuthClient and an OAuthAuthenticationModule, which together seem to be analogous to the WSFAM, but they are configured in the Global.asax and you have to wire events up yourself. There doesn’t seem to be any OAuth equivalent of the SAM – again the sample does that with specific code in the Global.asax. Overall, the RTM WIF approach seems much cleaner to me.

I was considering creating my own implementation but obviously I don't want to waste time doing this if there will be official support in the near future.

So my question is: What are the plans for OAuth support in WIF? Is there an update planned in the near future? Can anyone tell me what the shape of the final release version of OAuth support will be?