-Automated checkin: bookending trunk build.

Endpoint for build number: 2319
Last trunk build number: 2318

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@23947 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
fix the clobber bug
hack that should make us not need to check for python2 or python3 anymore...make the make-buildinfo.py script compatible with either one (man, python is weird!)
Merge remote-tracking branch 'upstream/master' into sb-trunk-oldxul

Conflicts:
	build/sbBuildInfo.mk.in


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

Endpoint for build number: 2320
Last trunk build number: 2319

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

Endpoint for build number: 2321
Last trunk build number: 2320

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@23951 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Bug 25646 - As a user, I want to be able to *opt-out of installing the ASK toolbar* during the Songbird install process

Removed the second checkbox and added /local per email exchange with Mitch & Ask

r=me

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

Conflicts:
	build/sbBuildInfo.mk.in
- updated copyright on sbDirectoryImportService.js


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

Endpoint for build number: 2323
Last trunk build number: 2321

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@23961 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
fix for echo issue
Merge pull request #112 from johnmurrayvi/sb-trunk-oldxul

Merge fix for echo issue,
Discussed in 7126ac1e5d02cd9328ce59515c7043abf934ccda comments.
Merge remote-tracking branch 'upstream/master' into sb-trunk-oldxul

Conflicts:
	build/sbBuildInfo.mk.in
-Automated checkin: bookending trunk build.

Endpoint for build number: 2324
Last trunk build number: 2323

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

Endpoint for build number: 2325
Last trunk build number: 2324

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

Endpoint for build number: 2326
Last trunk build number: 2325

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

Endpoint for build number: 2327
Last trunk build number: 2326

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

Endpoint for build number: 2328
Last trunk build number: 2327

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

Conflicts:
	build/sbBuildInfo.mk.in