Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	configure.in
	src/Makefile.am
	src/device.cpp
	src/device_alsa.cpp
	src/input_mp3.cpp
	src/input_mp3.h
	third-party/vc6/include/FLAC/file_decoder.h
	third-party/vc6/include/FLAC/file_encoder.h
	third-party/vc6/include/FLAC/seekable_stream_decoder.h
	third-party/vc6/include/FLAC/seekable_stream_encoder.h
	vc7/audiere.sln
	vc7/audiere/audiere.vcproj
apply Will's wide filename changes
chmod 0755
make some changes necessary to build on Mac
fix mac support