Patched manifest files to fix distdirs unit test.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24265 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2410
Last trunk build number: 2408

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24266 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2411
Last trunk build number: 2410

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24268 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Testing version number change with localized installer.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24271 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2413
Last trunk build number: 2411

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24272 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Setting version to 2.1.0 to continue testing firstrun wizard.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24273 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2414
Last trunk build number: 2413

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24274 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Reverting the build number to the correct version for trunk.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24275 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Applied patches to the manifest files to fix the DistDirs unit tests.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24276 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2415
Last trunk build number: 2414

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24277 5aad4ff5-4b58-4159-ba3f-0e6328df4cad


git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24278 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Updating app icon assets, including missing assets.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24279 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2416
Last trunk build number: 2415

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24280 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Updating app icon assets, one last time...really, this is it.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24281 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2417
Last trunk build number: 2416

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24282 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Updating the splash screen for the first-run welcome page.

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24285 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
-Automated checkin: bookending trunk build.

Endpoint for build number: 2420
Last trunk build number: 2417

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24288 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Merge remote-tracking branch 'upstream/master' into sb-trunk-oldxul

Conflicts:
	app/branding/songbird-128.png
	app/branding/songbird-256.png
	app/branding/songbird-32.png
	app/branding/songbird-512.png
	app/branding/songbird-64.png
	app/branding/songbird.icns
	app/branding/songbird.ico
	app/branding/splash.bmp
	app/skin/branding/first-run-welcome.png
	build/sbBuildInfo.mk.in
	installer/macosx/MacSongbirdDiskImage.icns
	installer/windows/songbird.ico
	installer/windows/songbird_installer.ico
	installer/windows/songbird_nightly.ico
	installer/windows/songbird_uninstaller.ico
	installer/windows/songbird_vista.ico