- 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
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
-Automated checkin: bookending trunk build.

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

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

Endpoint for build number: 2330
Last trunk build number: 2329

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@23980 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Initialized merge tracking via "svnmerge" with revisions "1-23981" from 
svn://svn.songbirdnest.com/client/branches/Songbird2.1.0


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

Endpoint for build number: 2332
Last trunk build number: 2330

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

Endpoint for build number: 2335
Last trunk build number: 2332

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

Conflicts:
	build/sbBuildInfo.mk.in
Trying to support unpatched, recent taglib.
Not yet linking on Windows, but this might be a dependency issue. Untested.
-Automated checkin: bookending trunk build.

Endpoint for build number: 2336
Last trunk build number: 2335

git-svn-id: http://publicsvn.songbirdnest.com/client/trunk@23997 5aad4ff5-4b58-4159-ba3f-0e6328df4cad
Copied existing eula to phillips-eula-text.html and updated songbird-eula-text.html to our current version.

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