WindowsAzure/azure-content — pull request #373 by mollybostic (2012-10-02 00:39:38+00:00)
Title: Fixed merge conflict + No Staging Required

fixed merge conflict + accidentally pulled in a couple other updates in progress. No staging required