merge [13354] to trunk, and use the right .ico in the windows build

Makefile.am

@@ -181,9 +181,6 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
 	extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
 	extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-#	extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
-#	extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
-#	extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
 	extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
 	extras/MacOSX/Resources/a52.icns \
 	extras/MacOSX/Resources/aac.icns \
@@ -248,7 +245,6 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/README \
 	extras/MacOSX/vlc.pbproj/project.pbxproj \
 	extras/MacOSX/macosx-dmg \
-	\
 	extras/Makefile \
 	extras/zsh.cpp \
 	$(NULL)
@@ -883,7 +879,7 @@ package-win32-base:
            $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
 
-	cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
@@ -987,7 +983,7 @@ package-wince-base:
            $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
 
-	cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
 if BUILD_MOZILLA
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"