Fixed Silverlight/WP7 build

"We can’t automatically merge these branches.", still...