84869

http://phone.codeplex.com/SourceControl/changeset/84869
Merge branch 'master'