-Automated checkin: bookending trunk build.

Endpoint for build number: 2432
Last trunk build number: 2431

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@24313 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
songbird 2.2 update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build/sbBuildInfo.mk.in