add trollface to readme ...yes, this commit is very important
add splash psd to main for later, once this thing works... also update readme with new contributors
more conversion to new lock mechanism - Mook, please check this out
make changes per mook's advice...here's hoping all is well
more preliminary autolock related changes... Mook? I'm a n00b, help? lol
update/fix readme
fix window watcher as an example
(test compiled with gcc 4.5; YMMV, more configure bits might be needed)
Merge pull request #11 from mook/master

this seems to build, at least components/moz/{threads,variant,windowwatcher}
working towards getting lock fixes set on sbArray - Mook, there be dragons
some more lock fixes...
not quite finished with this
more errors, still no joy
yeah, still not there
this module should be good now - on to the next errors
sbErrorConsole: change infoMessageFlag to plain unsigned for 64 bit compat
sbThreadUtils: sbRunnableMethod1::Run(): explicitly get mObject first because nsRefPtr::operator->* can be confused
Merge pull request #12 from mook/master

make components/moz/errorconsole/src/ compile
Merge remote-tracking branch 'upstream/master' into test

Conflicts:
	app/application.ini.in
	app/content/bindings/browser/SBSessionStore.js
	app/content/scripts/mainWinInit.js
	branding/branding.mk
	branding/songbird-zzz-branding.js.in
	build/autodefs.mk.in
	build/config.mk
	build/rules.mk
	build/sbBuildInfo.mk.in
	components/library/localdatabase/src/sbLocalDatabaseSmartMediaList.cpp
	components/mediacore/base/public/sbIMediaInspector.idl
	components/mediacore/gstreamer/src/sbGStreamerMediaInspector.cpp
	components/mediacore/gstreamer/src/sbGStreamerMediacoreUtils.cpp
	components/mediacore/gstreamer/src/sbGStreamerMediacoreUtils.h
	components/mediacore/metadata/handler/taglib/src/Makefile.in
	components/mediaimport/filescan/src/sbFileScan.cpp
	components/moz/clipboard/src/sbClipboardHelper.h
	components/moz/clipboard/src/sbClipboardHelperModule.cpp
	components/moz/fileutils/src/sbDirectoryEnumerator.cpp
	components/moz/fileutils/src/sbDirectoryEnumerator.h
	components/moz/fileutils/src/sbFileUtilsModule.cpp
	components/moz/prompter/src/sbPrompter.cpp
	components/moz/prompter/src/sbPrompter.h
	components/moz/prompter/src/sbPrompterModule.cpp
	components/moz/strings/components/src/Makefile.in
	components/moz/strings/components/src/sbStringsModule.cpp
	components/moz/temporaryfileservice/src/sbTemporaryFileServiceModule.cpp
	components/moz/threadpoolservice/src/sbThreadPoolServiceModule.cpp
	components/moz/threads/src/sbThreadUtils.h
	components/moz/variant/src/sbVariant.cpp
	components/moz/variant/src/sbVariant.h
	components/moz/variant/src/sbVariantUtilsModule.cpp
	components/moz/windowwatcher/src/sbWindowWatcher.cpp
	components/moz/windowwatcher/src/sbWindowWatcher.h
	components/moz/windowwatcher/src/sbWindowWatcherModule.cpp
	components/moz/xpcom/src/sbArray.cpp
	components/moz/xpcom/src/sbArray.h
	components/moz/xpcom/src/sbWeakReference.cpp
	components/moz/xpcom/src/sbWeakReference.h
	components/moz/xpcom/src/sbXPCOMModule.cpp
	components/testharness/basetests/head_songbird.js
	components/testharness/basetests/tail_songbird.js
	configure.ac
	dependencies/Makefile.in
	installer/windows/Songbird.nsi
	songbird.mk
add the vcproj files...not really useful to me, but maybe someone else
some slight fixes from the merge