silverlight change

Same changes to made to the "Microsoft" branch.