Fix a bad merge
Fix a bad merge

edrohler/winjs,IveWong/winjs,gautamsi/winjs,PaulWells/winjs,rigdern/winjs,CensoredUser/winjs,PaulWells/winjs,edrohler/winjs,KevinTCoughlin/winjs,KevinTCoughlin/winjs,ladyinblack/winjs,IveWong/winjs,edrohler/winjs,ladyinblack/winjs,gautamsi/winjs,rigdern/winjs,nobuoka/winjs,Guadzilah/winjs,CensoredUser/winjs,GREYFOXRGR/winjs,IveWong/winjs,ladyinblack/winjs,GREYFOXRGR/winjs,gautamsi/winjs,rigdern/winjs,grork/winjs,CensoredUser/winjs,jmptrader/winjs,kevinwsbr/winjs,grork/winjs,Guadzilah/winjs,nobuoka/winjs,KevinTCoughlin/winjs,PaulWells/winjs,jmptrader/winjs,Guadzilah/winjs,kevinwsbr/winjs,jmptrader/winjs,kevinwsbr/winjs,grork/winjs,GREYFOXRGR/winjs,nobuoka/winjs