new revision
i believe this is the most recent version...they're pushing both trunk and stable for some reason
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/branding/splash.bmp
	build/sbBuildInfo.mk.in
	installer/windows/Makefile.in
	installer/windows/sb-installer.nsi