changeset 1458:f12d7e208b43 trunk

[svn] Update FSF address in copyright notices. Update autotools templates.
author chainsaw
date Wed, 02 Aug 2006 15:44:07 -0700
parents bbd5869239e5
children 705d4c089fce
files COPYING ChangeLog Plugins/Effect/audiocompress/COPYING Plugins/Effect/ladspa/ladspa.c Plugins/Effect/ladspa/ladspa.h Plugins/Effect/voice_removal/voice_removal.c Plugins/Input/aac/include/faad.h Plugins/Input/aac/include/neaacdec.h Plugins/Input/aac/libfaad2/analysis.h Plugins/Input/aac/libfaad2/bits.c Plugins/Input/aac/libfaad2/bits.h Plugins/Input/aac/libfaad2/cfft.c Plugins/Input/aac/libfaad2/cfft.h Plugins/Input/aac/libfaad2/cfft_tab.h Plugins/Input/aac/libfaad2/codebook/hcb.h Plugins/Input/aac/libfaad2/codebook/hcb_1.h Plugins/Input/aac/libfaad2/codebook/hcb_10.h Plugins/Input/aac/libfaad2/codebook/hcb_11.h Plugins/Input/aac/libfaad2/codebook/hcb_2.h Plugins/Input/aac/libfaad2/codebook/hcb_3.h Plugins/Input/aac/libfaad2/codebook/hcb_4.h Plugins/Input/aac/libfaad2/codebook/hcb_5.h Plugins/Input/aac/libfaad2/codebook/hcb_6.h Plugins/Input/aac/libfaad2/codebook/hcb_7.h Plugins/Input/aac/libfaad2/codebook/hcb_8.h Plugins/Input/aac/libfaad2/codebook/hcb_9.h Plugins/Input/aac/libfaad2/codebook/hcb_sf.h Plugins/Input/aac/libfaad2/common.c Plugins/Input/aac/libfaad2/common.h Plugins/Input/aac/libfaad2/decoder.c Plugins/Input/aac/libfaad2/decoder.h Plugins/Input/aac/libfaad2/drc.c Plugins/Input/aac/libfaad2/drc.h Plugins/Input/aac/libfaad2/drm_dec.c Plugins/Input/aac/libfaad2/drm_dec.h Plugins/Input/aac/libfaad2/error.c Plugins/Input/aac/libfaad2/error.h Plugins/Input/aac/libfaad2/filtbank.c Plugins/Input/aac/libfaad2/filtbank.h Plugins/Input/aac/libfaad2/fixed.h Plugins/Input/aac/libfaad2/hcr.c Plugins/Input/aac/libfaad2/huffman.c Plugins/Input/aac/libfaad2/huffman.h Plugins/Input/aac/libfaad2/ic_predict.c Plugins/Input/aac/libfaad2/ic_predict.h Plugins/Input/aac/libfaad2/iq_table.h Plugins/Input/aac/libfaad2/is.c Plugins/Input/aac/libfaad2/is.h Plugins/Input/aac/libfaad2/kbd_win.h Plugins/Input/aac/libfaad2/lt_predict.c Plugins/Input/aac/libfaad2/lt_predict.h Plugins/Input/aac/libfaad2/mdct.c Plugins/Input/aac/libfaad2/mdct.h Plugins/Input/aac/libfaad2/mdct_tab.h Plugins/Input/aac/libfaad2/mp4.c Plugins/Input/aac/libfaad2/mp4.h Plugins/Input/aac/libfaad2/ms.c Plugins/Input/aac/libfaad2/ms.h Plugins/Input/aac/libfaad2/output.c Plugins/Input/aac/libfaad2/output.h Plugins/Input/aac/libfaad2/pns.c Plugins/Input/aac/libfaad2/pns.h Plugins/Input/aac/libfaad2/ps_dec.c Plugins/Input/aac/libfaad2/ps_dec.h Plugins/Input/aac/libfaad2/ps_syntax.c Plugins/Input/aac/libfaad2/ps_tables.h Plugins/Input/aac/libfaad2/pulse.c Plugins/Input/aac/libfaad2/pulse.h Plugins/Input/aac/libfaad2/rvlc.c Plugins/Input/aac/libfaad2/rvlc.h Plugins/Input/aac/libfaad2/sbr_dct.c Plugins/Input/aac/libfaad2/sbr_dct.h Plugins/Input/aac/libfaad2/sbr_dec.c Plugins/Input/aac/libfaad2/sbr_dec.h Plugins/Input/aac/libfaad2/sbr_e_nf.c Plugins/Input/aac/libfaad2/sbr_e_nf.h Plugins/Input/aac/libfaad2/sbr_fbt.c Plugins/Input/aac/libfaad2/sbr_fbt.h Plugins/Input/aac/libfaad2/sbr_hfadj.c Plugins/Input/aac/libfaad2/sbr_hfadj.h Plugins/Input/aac/libfaad2/sbr_hfgen.c Plugins/Input/aac/libfaad2/sbr_hfgen.h Plugins/Input/aac/libfaad2/sbr_huff.c Plugins/Input/aac/libfaad2/sbr_huff.h Plugins/Input/aac/libfaad2/sbr_noise.h Plugins/Input/aac/libfaad2/sbr_qmf.c Plugins/Input/aac/libfaad2/sbr_qmf.h Plugins/Input/aac/libfaad2/sbr_qmf_c.h Plugins/Input/aac/libfaad2/sbr_syntax.c Plugins/Input/aac/libfaad2/sbr_syntax.h Plugins/Input/aac/libfaad2/sbr_tf_grid.c Plugins/Input/aac/libfaad2/sbr_tf_grid.h Plugins/Input/aac/libfaad2/sine_win.h Plugins/Input/aac/libfaad2/specrec.c Plugins/Input/aac/libfaad2/specrec.h Plugins/Input/aac/libfaad2/ssr.c Plugins/Input/aac/libfaad2/ssr.h Plugins/Input/aac/libfaad2/ssr_fb.c Plugins/Input/aac/libfaad2/ssr_fb.h Plugins/Input/aac/libfaad2/ssr_ipqf.c Plugins/Input/aac/libfaad2/ssr_ipqf.h Plugins/Input/aac/libfaad2/ssr_win.h Plugins/Input/aac/libfaad2/structs.h Plugins/Input/aac/libfaad2/syntax.c Plugins/Input/aac/libfaad2/syntax.h Plugins/Input/aac/libfaad2/tns.c Plugins/Input/aac/libfaad2/tns.h Plugins/Input/aac/mp4ff/drms.c Plugins/Input/aac/mp4ff/drms.h Plugins/Input/aac/mp4ff/drmstables.h Plugins/Input/aac/mp4ff/mp4atom.c Plugins/Input/aac/mp4ff/mp4ff.c Plugins/Input/aac/mp4ff/mp4ff.h Plugins/Input/aac/mp4ff/mp4ffint.h Plugins/Input/aac/mp4ff/mp4meta.c Plugins/Input/aac/mp4ff/mp4sample.c Plugins/Input/aac/mp4ff/mp4util.c Plugins/Input/aac/src/tagging.h Plugins/Input/aac/src/tagging_mp4.c Plugins/Input/aac/src/xmms-id3.h Plugins/Input/adplug/adplug-xmms.cc Plugins/Input/adplug/core/a2m.cpp Plugins/Input/adplug/core/a2m.h Plugins/Input/adplug/core/adl.cpp Plugins/Input/adplug/core/adl.h Plugins/Input/adplug/core/adlibemu.c Plugins/Input/adplug/core/adlibemu.h Plugins/Input/adplug/core/adplug.cpp Plugins/Input/adplug/core/adplug.h Plugins/Input/adplug/core/adtrack.cpp Plugins/Input/adplug/core/adtrack.h Plugins/Input/adplug/core/amd.cpp Plugins/Input/adplug/core/amd.h Plugins/Input/adplug/core/bam.cpp Plugins/Input/adplug/core/bam.h Plugins/Input/adplug/core/bmf.cpp Plugins/Input/adplug/core/bmf.h Plugins/Input/adplug/core/cff.cpp Plugins/Input/adplug/core/cff.h Plugins/Input/adplug/core/d00.cpp Plugins/Input/adplug/core/d00.h Plugins/Input/adplug/core/database.cpp Plugins/Input/adplug/core/database.h Plugins/Input/adplug/core/debug.c Plugins/Input/adplug/core/debug.h Plugins/Input/adplug/core/dfm.cpp Plugins/Input/adplug/core/dfm.h Plugins/Input/adplug/core/diskopl.cpp Plugins/Input/adplug/core/diskopl.h Plugins/Input/adplug/core/dmo.cpp Plugins/Input/adplug/core/dmo.h Plugins/Input/adplug/core/dro.cpp Plugins/Input/adplug/core/dro.h Plugins/Input/adplug/core/dtm.cpp Plugins/Input/adplug/core/dtm.h Plugins/Input/adplug/core/emuopl.cpp Plugins/Input/adplug/core/emuopl.h Plugins/Input/adplug/core/flash.cpp Plugins/Input/adplug/core/flash.h Plugins/Input/adplug/core/fmc.cpp Plugins/Input/adplug/core/fmc.h Plugins/Input/adplug/core/fmopl.c Plugins/Input/adplug/core/fprovide.cpp Plugins/Input/adplug/core/fprovide.h Plugins/Input/adplug/core/hsc.cpp Plugins/Input/adplug/core/hsc.h Plugins/Input/adplug/core/hsp.cpp Plugins/Input/adplug/core/hsp.h Plugins/Input/adplug/core/hybrid.cpp Plugins/Input/adplug/core/hybrid.h Plugins/Input/adplug/core/hyp.cpp Plugins/Input/adplug/core/hyp.h Plugins/Input/adplug/core/imf.cpp Plugins/Input/adplug/core/imf.h Plugins/Input/adplug/core/kemuopl.h Plugins/Input/adplug/core/ksm.cpp Plugins/Input/adplug/core/ksm.h Plugins/Input/adplug/core/lds.cpp Plugins/Input/adplug/core/lds.h Plugins/Input/adplug/core/mad.cpp Plugins/Input/adplug/core/mad.h Plugins/Input/adplug/core/mid.cpp Plugins/Input/adplug/core/mid.h Plugins/Input/adplug/core/mididata.h Plugins/Input/adplug/core/mkj.cpp Plugins/Input/adplug/core/mkj.h Plugins/Input/adplug/core/msc.cpp Plugins/Input/adplug/core/msc.h Plugins/Input/adplug/core/mtk.cpp Plugins/Input/adplug/core/mtk.h Plugins/Input/adplug/core/opl.h Plugins/Input/adplug/core/player.cpp Plugins/Input/adplug/core/player.h Plugins/Input/adplug/core/players.cpp Plugins/Input/adplug/core/players.h Plugins/Input/adplug/core/protrack.cpp Plugins/Input/adplug/core/protrack.h Plugins/Input/adplug/core/psi.cpp Plugins/Input/adplug/core/psi.h Plugins/Input/adplug/core/rad.cpp Plugins/Input/adplug/core/rad.h Plugins/Input/adplug/core/rat.cpp Plugins/Input/adplug/core/rat.h Plugins/Input/adplug/core/raw.cpp Plugins/Input/adplug/core/raw.h Plugins/Input/adplug/core/rix.cpp Plugins/Input/adplug/core/rix.h Plugins/Input/adplug/core/rol.cpp Plugins/Input/adplug/core/rol.h Plugins/Input/adplug/core/s3m.cpp Plugins/Input/adplug/core/s3m.h Plugins/Input/adplug/core/sa2.cpp Plugins/Input/adplug/core/sa2.h Plugins/Input/adplug/core/silentopl.h Plugins/Input/adplug/core/sng.cpp Plugins/Input/adplug/core/sng.h Plugins/Input/adplug/core/temuopl.cpp Plugins/Input/adplug/core/temuopl.h Plugins/Input/adplug/core/u6m.cpp Plugins/Input/adplug/core/u6m.h Plugins/Input/adplug/core/xad.cpp Plugins/Input/adplug/core/xad.h Plugins/Input/adplug/core/xsm.cpp Plugins/Input/adplug/core/xsm.h Plugins/Input/amidi-plug/amidi-plug.c Plugins/Input/amidi-plug/amidi-plug.h Plugins/Input/amidi-plug/backend-alsa/b-alsa-config.h Plugins/Input/amidi-plug/backend-alsa/b-alsa.c Plugins/Input/amidi-plug/backend-alsa/b-alsa.h Plugins/Input/amidi-plug/backend-dummy/b-dummy-config.h Plugins/Input/amidi-plug/backend-dummy/b-dummy.c Plugins/Input/amidi-plug/backend-dummy/b-dummy.h Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth-config.h Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.c Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.h Plugins/Input/amidi-plug/i_backend.c Plugins/Input/amidi-plug/i_backend.h Plugins/Input/amidi-plug/i_common.h Plugins/Input/amidi-plug/i_configure-alsa.c Plugins/Input/amidi-plug/i_configure-alsa.h Plugins/Input/amidi-plug/i_configure-ap.c Plugins/Input/amidi-plug/i_configure-ap.h Plugins/Input/amidi-plug/i_configure-dummy.c Plugins/Input/amidi-plug/i_configure-dummy.h Plugins/Input/amidi-plug/i_configure-fluidsynth.c Plugins/Input/amidi-plug/i_configure-fluidsynth.h Plugins/Input/amidi-plug/i_configure.c Plugins/Input/amidi-plug/i_configure.h Plugins/Input/amidi-plug/i_configure_private.h Plugins/Input/amidi-plug/i_fileinfo.c Plugins/Input/amidi-plug/i_fileinfo.h Plugins/Input/amidi-plug/i_midi.c Plugins/Input/amidi-plug/i_midi.h Plugins/Input/amidi-plug/i_midievent.h Plugins/Input/amidi-plug/i_utils.c Plugins/Input/amidi-plug/i_utils.h Plugins/Input/amidi-plug/pcfg/i_pcfg.c Plugins/Input/amidi-plug/pcfg/i_pcfg.h Plugins/Input/cdaudio/cdaudio.c Plugins/Input/cdaudio/cdaudio.h Plugins/Input/cdaudio/cddb.c Plugins/Input/cdaudio/cddb.h Plugins/Input/cdaudio/cdinfo.c Plugins/Input/cdaudio/cdinfo.h Plugins/Input/cdaudio/configure.c Plugins/Input/cdaudio/http.c Plugins/Input/cdaudio/http.h Plugins/Input/console/Blip_Buffer.cpp Plugins/Input/console/Classic_Emu.cpp Plugins/Input/console/Dual_Resampler.cpp Plugins/Input/console/Fir_Resampler.cpp Plugins/Input/console/Gb_Apu.cpp Plugins/Input/console/Gb_Cpu.cpp Plugins/Input/console/Gb_Oscs.cpp Plugins/Input/console/Gbs_Emu.cpp Plugins/Input/console/Gym_Emu.cpp Plugins/Input/console/Multi_Buffer.cpp Plugins/Input/console/Music_Emu.cpp Plugins/Input/console/Nes_Apu.cpp Plugins/Input/console/Nes_Cpu.cpp Plugins/Input/console/Nes_Fme7_Apu.cpp Plugins/Input/console/Nes_Namco_Apu.cpp Plugins/Input/console/Nes_Oscs.cpp Plugins/Input/console/Nes_Vrc6_Apu.cpp Plugins/Input/console/Nsf_Emu.cpp Plugins/Input/console/Nsfe_Emu.cpp Plugins/Input/console/Sms_Apu.cpp Plugins/Input/console/Snes_Spc.cpp Plugins/Input/console/Spc_Cpu.cpp Plugins/Input/console/Spc_Dsp.cpp Plugins/Input/console/Spc_Emu.cpp Plugins/Input/console/Track_Emu.cpp Plugins/Input/console/Vgm_Emu.cpp Plugins/Input/console/Vgm_Emu_Impl.cpp Plugins/Input/console/Ym2612_Emu.cpp Plugins/Input/flac/Makefile.lite Plugins/Input/flac/charset.c Plugins/Input/flac/charset.h Plugins/Input/flac/configure.c Plugins/Input/flac/configure.h Plugins/Input/flac/file.c Plugins/Input/flac/fileinfo.c Plugins/Input/flac/grabbag.h Plugins/Input/flac/grabbag/cuesheet.h Plugins/Input/flac/grabbag/file.h Plugins/Input/flac/grabbag/replaygain.h Plugins/Input/flac/grabbag/seektable.h Plugins/Input/flac/http.c Plugins/Input/flac/http.h Plugins/Input/flac/plugin.c Plugins/Input/flac/plugin.h Plugins/Input/flac/plugin_common/Makefile.lite Plugins/Input/flac/plugin_common/all.h Plugins/Input/flac/plugin_common/charset.c Plugins/Input/flac/plugin_common/charset.h Plugins/Input/flac/plugin_common/defs.h Plugins/Input/flac/plugin_common/dither.c Plugins/Input/flac/plugin_common/dither.h Plugins/Input/flac/plugin_common/locale_hack.h Plugins/Input/flac/plugin_common/tags.c Plugins/Input/flac/plugin_common/tags.h Plugins/Input/flac/replaygain.c Plugins/Input/flac/replaygain_analysis.c Plugins/Input/flac/replaygain_analysis.h Plugins/Input/flac/replaygain_synthesis.c Plugins/Input/flac/replaygain_synthesis.h Plugins/Input/flac/tag.c Plugins/Input/flac/tag.h Plugins/Input/mpg123/fileinfo.c Plugins/Input/mpg123/http.c Plugins/Input/mpg123/interface.c Plugins/Input/mpg123/paranoia.c Plugins/Input/mpg123/resample.c Plugins/Input/mpg123/xmms-id3.h Plugins/Input/sexypsf/Misc.c Plugins/Input/sexypsf/Misc.h Plugins/Input/sexypsf/PsxBios.c Plugins/Input/sexypsf/PsxBios.h Plugins/Input/sexypsf/PsxCommon.h Plugins/Input/sexypsf/PsxCounters.c Plugins/Input/sexypsf/PsxCounters.h Plugins/Input/sexypsf/PsxDma.c Plugins/Input/sexypsf/PsxDma.h Plugins/Input/sexypsf/PsxHLE.c Plugins/Input/sexypsf/PsxHLE.h Plugins/Input/sexypsf/PsxHw.c Plugins/Input/sexypsf/PsxHw.h Plugins/Input/sexypsf/PsxInterpreter.c Plugins/Input/sexypsf/PsxMem.c Plugins/Input/sexypsf/PsxMem.h Plugins/Input/sexypsf/R3000A.c Plugins/Input/sexypsf/R3000A.h Plugins/Input/sexypsf/Spu.c Plugins/Input/sexypsf/Spu.h Plugins/Input/sexypsf/xmms.c Plugins/Input/sid/xmms-sid.c Plugins/Input/sid/xmms-sid.h Plugins/Input/sid/xs_about.c Plugins/Input/sid/xs_config.c Plugins/Input/sid/xs_fileinfo.c Plugins/Input/sid/xs_filter.c Plugins/Input/sid/xs_init.c Plugins/Input/sid/xs_length.c Plugins/Input/sid/xs_sidplay1.cc Plugins/Input/sid/xs_sidplay2.cc Plugins/Input/sid/xs_stil.c Plugins/Input/sid/xs_support.c Plugins/Input/sid/xs_title.c Plugins/Input/tonegen/tonegen.c Plugins/Input/vorbis/fileinfo.c Plugins/Input/vorbis/http.c Plugins/Input/vorbis/vorbis.c Plugins/Input/wav/wav-sndfile.c Plugins/Input/wav/wav-sndfile.h Plugins/Input/wav/wav.c Plugins/Input/wav/wav.h Plugins/Input/wma/libffwma/allcodecs.c Plugins/Input/wma/libffwma/allformats.c Plugins/Input/wma/libffwma/asf.c Plugins/Input/wma/libffwma/asfheader.h Plugins/Input/wma/libffwma/avio.c Plugins/Input/wma/libffwma/aviobuf.c Plugins/Input/wma/libffwma/bswap.h Plugins/Input/wma/libffwma/common.c Plugins/Input/wma/libffwma/cutils.c Plugins/Input/wma/libffwma/dsputil.c Plugins/Input/wma/libffwma/dsputil.h Plugins/Input/wma/libffwma/fft.c Plugins/Input/wma/libffwma/file.c Plugins/Input/wma/libffwma/futils.c Plugins/Input/wma/libffwma/mdct.c Plugins/Input/wma/libffwma/mms.c Plugins/Input/wma/libffwma/mms.h Plugins/Input/wma/libffwma/mmsh.c Plugins/Input/wma/libffwma/mmsh.h Plugins/Input/wma/libffwma/os_support.c Plugins/Input/wma/libffwma/parser.c Plugins/Input/wma/libffwma/simple_idct.c Plugins/Input/wma/libffwma/simple_idct.h Plugins/Input/wma/libffwma/uri.c Plugins/Input/wma/libffwma/uri.h Plugins/Input/wma/libffwma/utils.c Plugins/Input/wma/libffwma/wmadec.c Plugins/Input/wma/wma.c Plugins/Output/OSS/OSS.c Plugins/Output/OSS/OSS.h Plugins/Output/OSS/about.c Plugins/Output/OSS/audio.c Plugins/Output/OSS/configure.c Plugins/Output/OSS/convert.c Plugins/Output/OSS/init.c Plugins/Output/OSS/mixer.c Plugins/Output/alsa/about.c Plugins/Output/alsa/alsa.c Plugins/Output/alsa/alsa.h Plugins/Output/alsa/audio.c Plugins/Output/alsa/configure.c Plugins/Output/alsa/init.c Plugins/Output/arts/convert.c Plugins/Output/disk_writer/disk_writer.c Plugins/Output/esd/about.c Plugins/Output/esd/audio.c Plugins/Output/esd/configure.c Plugins/Output/esd/esdout.h Plugins/Output/esd/mixer.c Plugins/Output/jack/bio2jack.c Plugins/Output/jack/bio2jack.h Plugins/Output/jack/configure.c Plugins/Output/sun/about.c Plugins/Output/sun/audio.c Plugins/Output/sun/configure.c Plugins/Output/sun/convert.c Plugins/Output/sun/mixer.c Plugins/Output/sun/mixer.h Plugins/Output/sun/resample.h Plugins/Output/sun/sun.c Plugins/Output/sun/sun.h Plugins/Visualization/blur_scope/Makefile.in Plugins/Visualization/blur_scope/blur_scope.c Plugins/Visualization/rocklight/rocklight.c Plugins/Visualization/rocklight/thinklight.c Plugins/Visualization/rocklight/thinklight.h audacious/about.c audacious/controlsocket.c audacious/controlsocket.h audacious/credits.c audacious/dnd.h audacious/dock.c audacious/dock.h audacious/effect.c audacious/effect.h audacious/eq_graph.c audacious/eq_graph.h audacious/eq_slider.c audacious/eq_slider.h audacious/equalizer.c audacious/equalizer.h audacious/fft.c audacious/fft.h audacious/general.c audacious/general.h audacious/genevent.c audacious/genevent.h audacious/getopt.c audacious/getopt.h audacious/getopt1.c audacious/glade.c audacious/glade.h audacious/hints.c audacious/hints.h audacious/hslider.c audacious/hslider.h audacious/input.c audacious/input.h audacious/logger.c audacious/logger.h audacious/main.c audacious/main.h audacious/mainwin.c audacious/mainwin.h audacious/menurow.c audacious/menurow.h audacious/monostereo.c audacious/monostereo.h audacious/number.c audacious/number.h audacious/output.c audacious/output.h audacious/pbutton.c audacious/pbutton.h audacious/playback.c audacious/playback.h audacious/playlist.h audacious/playlist_list.c audacious/playlist_list.h audacious/playlist_slider.c audacious/playlist_slider.h audacious/playstatus.c audacious/playstatus.h audacious/pluginenum.c audacious/pluginenum.h audacious/prefswin.c audacious/prefswin.h audacious/sbutton.c audacious/sbutton.h audacious/skin.c audacious/skin.h audacious/skinwin.c audacious/skinwin.h audacious/softvolume.c audacious/softvolume.h audacious/svis.c audacious/svis.h audacious/tbutton.c audacious/tbutton.h audacious/textbox.c audacious/textbox.h audacious/titlestring.h audacious/ui_fileinfo.c audacious/ui_fileinfo.h audacious/ui_playlist.c audacious/ui_playlist.h audacious/urldecode.c audacious/urldecode.h audacious/util.c audacious/util.h audacious/vis.c audacious/vis.h audacious/visualization.c audacious/visualization.h audacious/widget.c audacious/widget.h audtool/audtool.c audtool/audtool.h config.guess config.rpath config.sub intl/Makefile.in intl/bindtextdom.c intl/config.charset intl/dcgettext.c intl/dcigettext.c intl/dcngettext.c intl/dgettext.c intl/dngettext.c intl/eval-plural.h intl/explodename.c intl/finddomain.c intl/gettext.c intl/gettextP.h intl/gmo.h intl/hash-string.h intl/intl-compat.c intl/l10nflist.c intl/libgnuintl.h.in intl/loadinfo.h intl/loadmsgcat.c intl/localcharset.c intl/localcharset.h intl/locale.alias intl/localealias.c intl/localename.c intl/log.c intl/ngettext.c intl/os2compat.c intl/os2compat.h intl/osdep.c intl/plural-exp.c intl/plural-exp.h intl/plural.c intl/plural.y intl/ref-add.sin intl/ref-del.sin intl/relocatable.c intl/relocatable.h intl/textdomain.c libaudacious/beepctrl.c libaudacious/beepctrl.h libaudacious/configdb_gconf.c libaudacious/configdb_rcfile.c libaudacious/configdb_xmlfile.c libaudacious/configfile.c libaudacious/configfile.h libaudacious/dirbrowser.c libaudacious/dirbrowser.h libaudacious/rcfile.c libaudacious/rcfile.h libaudacious/titlestring.c libaudacious/titlestring.h libaudacious/vfs_gnome.c libaudacious/vfs_stdio.c libaudacious/xentry.c libaudacious/xentry.h libaudacious/xml_document.c libaudacious/xml_document.h
diffstat 595 files changed, 1139 insertions(+), 1493 deletions(-) [+]
line wrap: on
line diff
--- a/COPYING	Wed Aug 02 14:26:56 2006 -0700
+++ b/COPYING	Wed Aug 02 15:44:07 2006 -0700
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
--- a/ChangeLog	Wed Aug 02 14:26:56 2006 -0700
+++ b/ChangeLog	Wed Aug 02 15:44:07 2006 -0700
@@ -1,3 +1,15 @@
+2006-08-02 21:26:56 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [1828]
+  RockLight visualization plugin ported from XMMS.
+
+  Changes:        Modified:
+  +14 -0          trunk/Plugins/Visualization/rocklight/Makefile.in  
+  +77 -0          trunk/Plugins/Visualization/rocklight/rocklight.c  
+  +57 -0          trunk/Plugins/Visualization/rocklight/thinklight.c  
+  +34 -0          trunk/Plugins/Visualization/rocklight/thinklight.h  
+  +7 -2           trunk/configure.ac  
+
+
 2006-08-01 00:06:44 +0000  George Averill <nhjm449@gmail.com>
   revision [1826]
   - Don't poll the config database if not using TCP sockets.
--- a/Plugins/Effect/audiocompress/COPYING	Wed Aug 02 14:26:56 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
--- a/Plugins/Effect/ladspa/ladspa.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Effect/ladspa/ladspa.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 */
 
 /* BMP-ladspa port by Giacomo Lozito <city_hunter@users.sf.net> */
--- a/Plugins/Effect/ladspa/ladspa.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Effect/ladspa/ladspa.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
    
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307
    USA. */
 
 #ifndef LADSPA_INCLUDED
--- a/Plugins/Effect/voice_removal/voice_removal.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Effect/voice_removal/voice_removal.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA
  *
  */
 
--- a/Plugins/Input/aac/include/faad.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/include/faad.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/include/neaacdec.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/include/neaacdec.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/analysis.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/analysis.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/bits.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/bits.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/bits.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/bits.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/cfft.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/cfft.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/cfft.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/cfft.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/cfft_tab.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/cfft_tab.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_1.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_1.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_10.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_10.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_11.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_11.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_2.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_2.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_3.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_3.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_4.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_4.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_5.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_5.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_6.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_6.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_7.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_7.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_8.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_8.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_9.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_9.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/codebook/hcb_sf.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/codebook/hcb_sf.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/common.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/common.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/common.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/common.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/decoder.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/decoder.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/decoder.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/decoder.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/drc.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/drc.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/drc.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/drc.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/drm_dec.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/drm_dec.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/drm_dec.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/drm_dec.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/error.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/error.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/error.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/error.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/filtbank.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/filtbank.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/filtbank.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/filtbank.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/fixed.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/fixed.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/hcr.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/hcr.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/huffman.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/huffman.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/huffman.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/huffman.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ic_predict.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ic_predict.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ic_predict.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ic_predict.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/iq_table.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/iq_table.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/is.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/is.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/is.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/is.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/kbd_win.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/kbd_win.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/lt_predict.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/lt_predict.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/lt_predict.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/lt_predict.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/mdct.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/mdct.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/mdct.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/mdct.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/mdct_tab.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/mdct_tab.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/mp4.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/mp4.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/mp4.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/mp4.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ms.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ms.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ms.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ms.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/output.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/output.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/output.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/output.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/pns.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/pns.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/pns.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/pns.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ps_dec.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ps_dec.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ps_dec.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ps_dec.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ps_syntax.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ps_syntax.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ps_tables.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ps_tables.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/pulse.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/pulse.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/pulse.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/pulse.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/rvlc.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/rvlc.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/rvlc.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/rvlc.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_dct.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_dct.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_dct.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_dct.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_dec.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_dec.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_dec.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_dec.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_e_nf.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_e_nf.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_e_nf.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_e_nf.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_fbt.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_fbt.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_fbt.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_fbt.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_hfadj.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_hfadj.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_hfadj.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_hfadj.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_hfgen.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_hfgen.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_hfgen.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_hfgen.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_huff.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_huff.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_huff.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_huff.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_noise.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_noise.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_qmf.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_qmf.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_qmf.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_qmf.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_qmf_c.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_qmf_c.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_syntax.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_syntax.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_syntax.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_syntax.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_tf_grid.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_tf_grid.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sbr_tf_grid.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sbr_tf_grid.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/sine_win.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/sine_win.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/specrec.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/specrec.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/specrec.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/specrec.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ssr.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ssr.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ssr.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ssr.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ssr_fb.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ssr_fb.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ssr_fb.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ssr_fb.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** $Id: ssr_fb.h,v 1.13 2004/09/04 14:56:29 menno Exp $
 **/
--- a/Plugins/Input/aac/libfaad2/ssr_ipqf.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ssr_ipqf.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/ssr_ipqf.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ssr_ipqf.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** $Id: ssr_ipqf.h,v 1.14 2004/09/04 14:56:29 menno Exp $
 **/
--- a/Plugins/Input/aac/libfaad2/ssr_win.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/ssr_win.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** $Id: ssr_win.h,v 1.13 2004/09/04 14:56:29 menno Exp $
 **/
--- a/Plugins/Input/aac/libfaad2/structs.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/structs.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/syntax.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/syntax.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/syntax.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/syntax.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/tns.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/tns.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/libfaad2/tns.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/libfaad2/tns.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 ** 
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/mp4ff/drms.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/drms.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
 #include <stdlib.h>                                      /* malloc(), free() */
--- a/Plugins/Input/aac/mp4ff/drms.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/drms.h	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
 
--- a/Plugins/Input/aac/mp4ff/drmstables.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/drmstables.h	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
 
--- a/Plugins/Input/aac/mp4ff/mp4atom.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/mp4atom.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/mp4ff/mp4ff.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/mp4ff.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/mp4ff/mp4ff.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/mp4ff.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/mp4ff/mp4ffint.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/mp4ffint.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/mp4ff/mp4meta.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/mp4meta.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/mp4ff/mp4sample.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/mp4sample.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/mp4ff/mp4util.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/mp4ff/mp4util.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 **
 ** You should have received a copy of the GNU General Public License
 ** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
 ** forbidden.
--- a/Plugins/Input/aac/src/tagging.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/src/tagging.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef _AUDMP4_TAGGING_H
--- a/Plugins/Input/aac/src/tagging_mp4.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/src/tagging_mp4.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
--- a/Plugins/Input/aac/src/xmms-id3.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/aac/src/xmms-id3.h	Wed Aug 02 15:44:07 2006 -0700
@@ -22,7 +22,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  *                
  ********************************************************************/
 #ifndef ID3_H
--- a/Plugins/Input/adplug/adplug-xmms.cc	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/adplug-xmms.cc	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with this plugin; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 */
 
 #include <algorithm>
--- a/Plugins/Input/adplug/core/a2m.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/a2m.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * a2m.cpp - A2M Loader by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/a2m.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/a2m.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * a2m.h - A2M Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/adl.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adl.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * adl.cpp - ADL player adaption by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/adl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * adl.h - ADL player adaption by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/adlibemu.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adlibemu.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 /*
--- a/Plugins/Input/adplug/core/adlibemu.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adlibemu.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 void adlibinit(long dasamplerate,long danumspeakers,long dabytespersample);
--- a/Plugins/Input/adplug/core/adplug.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adplug.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * adplug.cpp - CAdPlug utility class, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/adplug.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adplug.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * adplug.h - AdPlug main header file, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/adtrack.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adtrack.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * adtrack.cpp - Adlib Tracker 1.0 Loader by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/adtrack.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/adtrack.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * adtrack.h - Adlib Tracker 1.0 Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/amd.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/amd.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * amd.cpp - AMD Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/amd.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/amd.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * amd.h - AMD Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/bam.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/bam.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * bam.cpp - Bob's Adlib Music Player, by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/bam.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/bam.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * bam.h - Bob's Adlib Music Player, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/bmf.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/bmf.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] BMF player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/bmf.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/bmf.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] BMF player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/cff.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/cff.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   cff.cpp - BoomTracker loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/cff.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/cff.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   cff.h - BoomTracker loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/d00.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/d00.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * d00.c - D00 Player by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/d00.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/d00.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * d00.h - D00 Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/database.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/database.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * database.cpp - AdPlug database class
  * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
--- a/Plugins/Input/adplug/core/database.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/database.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * database.h - AdPlug database class
  * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
--- a/Plugins/Input/adplug/core/debug.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/debug.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * debug.h - AdPlug Debug Logger
  * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
--- a/Plugins/Input/adplug/core/debug.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/debug.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * debug.h - AdPlug Debug Logger
  * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
--- a/Plugins/Input/adplug/core/dfm.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dfm.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * dfm.cpp - Digital-FM Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/dfm.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dfm.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * dfm.h - Digital-FM Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/diskopl.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/diskopl.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * diskopl.cpp - Disk Writer OPL, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/diskopl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/diskopl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * diskopl.h - Disk Writer OPL, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/dmo.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dmo.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   dmo.cpp - TwinTeam loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/dmo.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dmo.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   dmo.cpp - TwinTeam loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/dro.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dro.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * dro.c - DOSBox Raw OPL Player by Sjoerd van der Berg <harekiet@zophar.net>
  *
--- a/Plugins/Input/adplug/core/dro.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dro.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * dro.h - DOSBox Raw OPL Player by Sjoerd van der Berg <harekiet@zophar.net>
  */
--- a/Plugins/Input/adplug/core/dtm.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dtm.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   dtm.cpp - DTM loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/dtm.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/dtm.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   dtm.h - DTM loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/emuopl.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/emuopl.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * emuopl.cpp - Emulated OPL, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/emuopl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/emuopl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * emuopl.h - Emulated OPL, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/flash.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/flash.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] FLASH player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/flash.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/flash.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] FLASH player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/fmc.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/fmc.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   fmc.cpp - FMC Loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/fmc.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/fmc.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   fmc.h - FMC loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/fmopl.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/fmopl.c	Wed Aug 02 15:44:07 2006 -0700
@@ -28,7 +28,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #define INLINE		__inline
--- a/Plugins/Input/adplug/core/fprovide.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/fprovide.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * fprovide.cpp - File provider class framework, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/fprovide.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/fprovide.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * fprovide.h - File provider class framework, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/hsc.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hsc.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * hsc.cpp - HSC Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/hsc.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hsc.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * hsc.h - HSC Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/hsp.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hsp.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * hsp.cpp - HSP Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/hsp.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hsp.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * hsp.h: HSC Packed Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/hybrid.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hybrid.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] HYBRID player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/hybrid.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hybrid.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] HYBRID player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/hyp.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hyp.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] HYP player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/hyp.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/hyp.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] HYP player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/imf.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/imf.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * imf.cpp - IMF Player by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/imf.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/imf.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * imf.h - IMF Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/kemuopl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/kemuopl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * kemuopl.h - Emulated OPL using Ken Silverman's emulator, by Simon Peter
  *             <dn.tlp@gmx.net>
--- a/Plugins/Input/adplug/core/ksm.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/ksm.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * ksm.cpp - KSM Player for AdPlug by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/ksm.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/ksm.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * ksm.h - KSM Player for AdPlug by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/lds.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/lds.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * lds.cpp - LOUDNESS Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/lds.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/lds.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * lds.h - LOUDNESS Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/mad.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mad.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   mad.cpp - MAD loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/mad.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mad.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   mad.h - MAD loader by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/mid.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mid.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  *
  * MIDI & MIDI-like file player - Last Update: 10/15/2005
--- a/Plugins/Input/adplug/core/mid.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mid.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * mid.h - LAA, SCI, MID & CMF Player by Philip Hassey <philhassey@hotmail.com>
  */
--- a/Plugins/Input/adplug/core/mididata.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mididata.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  *
  * FM instrument definitions below borrowed from the Allegro library by
--- a/Plugins/Input/adplug/core/mkj.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mkj.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * mkj.cpp - MKJamz Player, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/mkj.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mkj.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * mkj.h - MKJamz Player, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/msc.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/msc.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * msc.c - MSC Player by Lubomir Bulej (pallas@kadan.cz)
  */
--- a/Plugins/Input/adplug/core/msc.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/msc.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * msc.h - MSC Player by Lubomir Bulej (pallas@kadan.cz)
  */
--- a/Plugins/Input/adplug/core/mtk.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mtk.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * mtk.cpp - MPU-401 Trakker Loader by Simon Peter (dn.tlp@gmx.net)
  */
--- a/Plugins/Input/adplug/core/mtk.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/mtk.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * mtk.h - MPU-401 Trakker Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/opl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/opl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * opl.h - OPL base class, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/player.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/player.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * player.cpp - Replayer base class, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/player.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/player.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * player.h - Replayer base class, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/players.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/players.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * players.h - Players enumeration, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/players.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/players.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * players.h - Players enumeration, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/protrack.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/protrack.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * protrack.cpp - Generic Protracker Player
  *
--- a/Plugins/Input/adplug/core/protrack.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/protrack.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * protrack.h - Generic Protracker Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/psi.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/psi.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] PSI player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/psi.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/psi.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] PSI player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/rad.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rad.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * rad.cpp - RAD Loader by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/rad.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rad.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * rad.h - RAD Loader by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/rat.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rat.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] RAT player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/rat.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rat.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * [xad] RAT player, by Riven the Mage <riven@ok.ru>
  */
--- a/Plugins/Input/adplug/core/raw.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/raw.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * raw.c - RAW Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/raw.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/raw.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * raw.h - RAW Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/rix.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rix.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * rix.cpp - Softstar RIX OPL Format Player by palxex <palxex.ys168.com>
  *                                             BSPAL <BSPAL.ys168.com>
--- a/Plugins/Input/adplug/core/rix.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rix.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * rix.h - Softstar RIX OPL Format Player by palxex <palxex.ys168.com>
  *                                           BSPAL <BSPAL.ys168.com>
--- a/Plugins/Input/adplug/core/rol.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rol.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * rol.h - ROL Player by OPLx <oplx@yahoo.com>
  *
--- a/Plugins/Input/adplug/core/rol.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/rol.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * rol.h - ROL Player by OPLx <oplx@yahoo.com>
  *
--- a/Plugins/Input/adplug/core/s3m.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/s3m.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * s3m.c - S3M Player by Simon Peter <dn.tlp@gmx.net>
  *
--- a/Plugins/Input/adplug/core/s3m.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/s3m.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * s3m.h - AdLib S3M Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/sa2.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/sa2.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * sa2.cpp - SAdT2 Loader by Simon Peter <dn.tlp@gmx.net>
  *           SAdT Loader by Mamiya <mamiya@users.sourceforge.net>
--- a/Plugins/Input/adplug/core/sa2.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/sa2.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * sa2.h - SAdT2 Loader by Simon Peter <dn.tlp@gmx.net>
  *         SAdT Loader by Mamiya <mamiya@users.sourceforge.net>
--- a/Plugins/Input/adplug/core/silentopl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/silentopl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * silentopl.h - Silent OPL device, by Simon Peter (dn.tlp@gmx.net)
  */
--- a/Plugins/Input/adplug/core/sng.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/sng.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * sng.cpp - SNG Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/sng.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/sng.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * sng.h - SNG Player by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/temuopl.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/temuopl.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * temuopl.cpp - Tatsuyuki Satoh's OPL2 emulator, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/temuopl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/temuopl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * temuopl.h - Tatsuyuki Satoh's OPL2 emulator, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/u6m.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/u6m.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * u6m.cpp - Ultima 6 Music Player by Marc Winterrowd.
  * This code extends the Adlib Winamp plug-in by Simon Peter <dn.tlp@gmx.net>
--- a/Plugins/Input/adplug/core/u6m.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/u6m.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * u6m.h - Ultima 6 Music Player by Marc Winterrowd.
  * This code extends the Adlib Winamp plug-in by Simon Peter <dn.tlp@gmx.net>
--- a/Plugins/Input/adplug/core/xad.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/xad.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   xad.cpp - XAD shell player by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/xad.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/xad.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 
   xad.h - XAD shell player by Riven the Mage <riven@ok.ru>
 */
--- a/Plugins/Input/adplug/core/xsm.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/xsm.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * xsm.cpp - eXtra Simple Music Player, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/adplug/core/xsm.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/adplug/core/xsm.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  * 
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * xsm.h - eXtra Simple Music Player, by Simon Peter <dn.tlp@gmx.net>
  */
--- a/Plugins/Input/amidi-plug/amidi-plug.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/amidi-plug.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/amidi-plug.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/amidi-plug.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-alsa/b-alsa-config.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-alsa/b-alsa-config.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-alsa/b-alsa.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-alsa/b-alsa.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-alsa/b-alsa.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-alsa/b-alsa.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-dummy/b-dummy-config.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-dummy/b-dummy-config.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-dummy/b-dummy.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-dummy/b-dummy.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-dummy/b-dummy.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-dummy/b-dummy.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth-config.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth-config.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/backend-fluidsynth/b-fluidsynth.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_backend.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_backend.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_backend.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_backend.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_common.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_common.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-alsa.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-alsa.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-alsa.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-alsa.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-ap.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-ap.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-ap.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-ap.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-dummy.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-dummy.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-dummy.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-dummy.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-fluidsynth.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-fluidsynth.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure-fluidsynth.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure-fluidsynth.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_configure_private.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_configure_private.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_fileinfo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_fileinfo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_fileinfo.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_fileinfo.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_midi.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_midi.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_midi.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_midi.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_midievent.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_midievent.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_utils.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_utils.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/i_utils.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/i_utils.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/pcfg/i_pcfg.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/pcfg/i_pcfg.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/amidi-plug/pcfg/i_pcfg.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/amidi-plug/pcfg/i_pcfg.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
-* 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307  USA
 *
 */
 
--- a/Plugins/Input/cdaudio/cdaudio.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/cdaudio.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/Plugins/Input/cdaudio/cdaudio.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/cdaudio.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef CDAUDIO_H
 #define CDAUDIO_H
--- a/Plugins/Input/cdaudio/cddb.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/cddb.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 
--- a/Plugins/Input/cdaudio/cddb.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/cddb.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 
--- a/Plugins/Input/cdaudio/cdinfo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/cdinfo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 
--- a/Plugins/Input/cdaudio/cdinfo.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/cdinfo.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef CDINFO_H
 #define CDINFO_H
--- a/Plugins/Input/cdaudio/configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "cdaudio.h"
--- a/Plugins/Input/cdaudio/http.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/http.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 /* FIXME: We need to have *one* place in xmms where you configure proxies */
--- a/Plugins/Input/cdaudio/http.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/cdaudio/http.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef XMMS_HTTP_H
--- a/Plugins/Input/console/Blip_Buffer.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Blip_Buffer.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 int const buffer_extra = blip_widest_impulse_ + 2;
 
--- a/Plugins/Input/console/Classic_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Classic_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Dual_Resampler.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Dual_Resampler.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Fir_Resampler.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Fir_Resampler.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Gb_Apu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Gb_Apu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Gb_Cpu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Gb_Cpu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Gb_Oscs.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Gb_Oscs.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Gbs_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Gbs_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Gym_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Gym_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Multi_Buffer.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Multi_Buffer.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -12,7 +12,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Music_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Music_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nes_Apu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nes_Apu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -12,7 +12,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nes_Cpu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nes_Cpu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nes_Fme7_Apu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nes_Fme7_Apu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nes_Namco_Apu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nes_Namco_Apu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -12,7 +12,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nes_Oscs.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nes_Oscs.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -12,7 +12,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nes_Vrc6_Apu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nes_Vrc6_Apu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -12,7 +12,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nsf_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nsf_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -23,7 +23,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Nsfe_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Nsfe_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Sms_Apu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Sms_Apu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -12,7 +12,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Snes_Spc.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Snes_Spc.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Spc_Cpu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Spc_Cpu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Spc_Dsp.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Spc_Dsp.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Spc_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Spc_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Track_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Track_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Vgm_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Vgm_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Vgm_Emu_Impl.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Vgm_Emu_Impl.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 #include BLARGG_SOURCE_BEGIN
 
--- a/Plugins/Input/console/Ym2612_Emu.cpp	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/console/Ym2612_Emu.cpp	Wed Aug 02 15:44:07 2006 -0700
@@ -22,7 +22,7 @@
 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA */
 
 // This is mostly the original source in its C style and all.
 //
--- a/Plugins/Input/flac/Makefile.lite	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/Makefile.lite	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
 
 #
 # GNU makefile
--- a/Plugins/Input/flac/charset.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/charset.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include <stdlib.h>
--- a/Plugins/Input/flac/charset.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/charset.h	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 
--- a/Plugins/Input/flac/configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include <stdlib.h>
--- a/Plugins/Input/flac/configure.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/configure.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef __CONFIGURE_H__
--- a/Plugins/Input/flac/file.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/file.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #if defined _MSC_VER || defined __MINGW32__
--- a/Plugins/Input/flac/fileinfo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/fileinfo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <stdlib.h>
--- a/Plugins/Input/flac/grabbag.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/grabbag.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef SHARE__GRABBAG_H
--- a/Plugins/Input/flac/grabbag/cuesheet.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/grabbag/cuesheet.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 /* This .h cannot be included by itself; #include "share/grabbag.h" instead. */
--- a/Plugins/Input/flac/grabbag/file.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/grabbag/file.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 /* Convenience routines for manipulating files */
--- a/Plugins/Input/flac/grabbag/replaygain.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/grabbag/replaygain.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 /*
--- a/Plugins/Input/flac/grabbag/seektable.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/grabbag/seektable.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 /* Convenience routines for working with seek tables */
--- a/Plugins/Input/flac/http.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/http.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 /* modified for FLAC support by Steven Richman (2003) */
 #include <sys/types.h>
--- a/Plugins/Input/flac/http.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/http.h	Wed Aug 02 15:44:07 2006 -0700
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef __HTTP_H__
--- a/Plugins/Input/flac/plugin.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include <stdlib.h>
--- a/Plugins/Input/flac/plugin.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef FLAC__PLUGIN_XMMS__PLUGIN_H
--- a/Plugins/Input/flac/plugin_common/Makefile.lite	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/Makefile.lite	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
 
 #
 # GNU makefile
--- a/Plugins/Input/flac/plugin_common/all.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/all.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef FLAC__PLUGIN_COMMON__ALL_H
--- a/Plugins/Input/flac/plugin_common/charset.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/charset.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include <stdio.h>
--- a/Plugins/Input/flac/plugin_common/charset.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/charset.h	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 
--- a/Plugins/Input/flac/plugin_common/defs.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/defs.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef FLAC__PLUGIN_COMMON__DEFS_H
--- a/Plugins/Input/flac/plugin_common/dither.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/dither.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include "dither.h"
--- a/Plugins/Input/flac/plugin_common/dither.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/dither.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef FLAC__PLUGIN_COMMON__DITHER_H
--- a/Plugins/Input/flac/plugin_common/locale_hack.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/locale_hack.h	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 /*
  * Gettext support for EasyTAG
--- a/Plugins/Input/flac/plugin_common/tags.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/tags.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include <stdio.h>
--- a/Plugins/Input/flac/plugin_common/tags.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/plugin_common/tags.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef FLAC__PLUGIN_COMMON__TAGS_H
--- a/Plugins/Input/flac/replaygain.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/replaygain.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include "grabbag.h"
--- a/Plugins/Input/flac/replaygain_analysis.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/replaygain_analysis.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  *  concept and filter values by David Robinson (David@Robinson.org)
  *    -- blame him if you think the idea is flawed
--- a/Plugins/Input/flac/replaygain_analysis.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/replaygain_analysis.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  *  concept and filter values by David Robinson (David@Robinson.org)
  *    -- blame him if you think the idea is flawed
--- a/Plugins/Input/flac/replaygain_synthesis.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/replaygain_synthesis.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 /*
  * This is an aggregation of pieces of code from John Edwards' WaveGain
--- a/Plugins/Input/flac/replaygain_synthesis.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/replaygain_synthesis.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef FLAC__SHARE__REPLAYGAIN_SYNTHESIS_H
--- a/Plugins/Input/flac/tag.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/tag.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #include <stdlib.h>
--- a/Plugins/Input/flac/tag.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/flac/tag.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
 #ifndef __FLAC__PLUGIN_XMMS__TAG_H__
--- a/Plugins/Input/mpg123/fileinfo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/mpg123/fileinfo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "mpg123.h"
--- a/Plugins/Input/mpg123/http.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/mpg123/http.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
--- a/Plugins/Input/mpg123/interface.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/mpg123/interface.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include "common.h"
--- a/Plugins/Input/mpg123/paranoia.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/mpg123/paranoia.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
--- a/Plugins/Input/mpg123/resample.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/mpg123/resample.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
--- a/Plugins/Input/mpg123/xmms-id3.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/mpg123/xmms-id3.h	Wed Aug 02 15:44:07 2006 -0700
@@ -22,7 +22,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA.
  *                
  ********************************************************************/
 #ifndef ID3_H
--- a/Plugins/Input/sexypsf/Misc.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/Misc.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
--- a/Plugins/Input/sexypsf/Misc.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/Misc.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __MISC_H__
--- a/Plugins/Input/sexypsf/PsxBios.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxBios.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h> 
--- a/Plugins/Input/sexypsf/PsxBios.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxBios.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __PSXBIOS_H__
--- a/Plugins/Input/sexypsf/PsxCommon.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxCommon.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __PSXCOMMON_H__
--- a/Plugins/Input/sexypsf/PsxCounters.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxCounters.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
--- a/Plugins/Input/sexypsf/PsxCounters.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxCounters.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __PSXCOUNTERS_H__
--- a/Plugins/Input/sexypsf/PsxDma.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxDma.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include "PsxCommon.h"
--- a/Plugins/Input/sexypsf/PsxDma.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxDma.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __PSXDMA_H__
--- a/Plugins/Input/sexypsf/PsxHLE.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxHLE.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 
--- a/Plugins/Input/sexypsf/PsxHLE.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxHLE.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __PSXHLE_H__
--- a/Plugins/Input/sexypsf/PsxHw.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxHw.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
--- a/Plugins/Input/sexypsf/PsxHw.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxHw.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __PSXHW_H__
--- a/Plugins/Input/sexypsf/PsxInterpreter.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxInterpreter.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <stdlib.h>
--- a/Plugins/Input/sexypsf/PsxMem.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxMem.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <string.h>
--- a/Plugins/Input/sexypsf/PsxMem.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/PsxMem.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __PSXMEMORY_H__
--- a/Plugins/Input/sexypsf/R3000A.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/R3000A.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include <stdio.h>
--- a/Plugins/Input/sexypsf/R3000A.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/R3000A.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __R3000A_H__
--- a/Plugins/Input/sexypsf/Spu.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/Spu.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include "PsxCommon.h"
--- a/Plugins/Input/sexypsf/Spu.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/Spu.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef __SPU_H__
--- a/Plugins/Input/sexypsf/xmms.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sexypsf/xmms.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
 */
 
 #include "audacious/output.h"
--- a/Plugins/Input/sid/xmms-sid.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xmms-sid.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 
 #include "xmms-sid.h"
--- a/Plugins/Input/sid/xmms-sid.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xmms-sid.h	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #ifndef _XMMS_SID_H
 #define _XMMS_SID_H
--- a/Plugins/Input/sid/xs_about.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_about.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xmms-sid.h"
 #include <gtk/gtk.h>
--- a/Plugins/Input/sid/xs_config.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_config.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xs_config.h"
 #include "libaudacious/configdb.h"
--- a/Plugins/Input/sid/xs_fileinfo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_fileinfo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
--- a/Plugins/Input/sid/xs_filter.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_filter.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xs_filter.h"
 
--- a/Plugins/Input/sid/xs_init.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_init.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 
 #include "xmms-sid.h"
--- a/Plugins/Input/sid/xs_length.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_length.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xs_length.h"
 #include "xs_support.h"
--- a/Plugins/Input/sid/xs_sidplay1.cc	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_sidplay1.cc	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xmms-sid.h"
 
--- a/Plugins/Input/sid/xs_sidplay2.cc	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_sidplay2.cc	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xmms-sid.h"
 
--- a/Plugins/Input/sid/xs_stil.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_stil.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xs_stil.h"
 #include "xs_support.h"
--- a/Plugins/Input/sid/xs_support.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_support.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xmms-sid.h"
 #include "xs_support.h"
--- a/Plugins/Input/sid/xs_title.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/sid/xs_title.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 */
 #include "xs_title.h"
 #include "xs_support.h"
--- a/Plugins/Input/tonegen/tonegen.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/tonegen/tonegen.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "audacious/plugin.h"
--- a/Plugins/Input/vorbis/fileinfo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/vorbis/fileinfo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1307, USA.
  *
  */
--- a/Plugins/Input/vorbis/http.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/vorbis/http.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/Plugins/Input/vorbis/vorbis.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/vorbis/vorbis.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1307, USA.
  *
  */
--- a/Plugins/Input/wav/wav-sndfile.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wav/wav-sndfile.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
@@ -258,7 +258,7 @@
 			  "You should have received a copy of the GNU General Public \n"
 			  "License along with this program ; if not, write to \n"
 			  "the Free Software Foundation, Inc., \n"
-			  "59 Temple Place, Suite 330, \n"
+			  "51 Franklin Street, Fifth Floor, \n"
 			  "Boston, MA  02111-1307  USA"),
 			_("Ok"), FALSE, NULL, NULL);
 		g_signal_connect(G_OBJECT(box), "destroy",
--- a/Plugins/Input/wav/wav-sndfile.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wav/wav-sndfile.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef WAV_SNDFILE_H
--- a/Plugins/Input/wav/wav.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wav/wav.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "wav.h"
--- a/Plugins/Input/wav/wav.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wav/wav.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef WAV_H
 #define WAV_H
--- a/Plugins/Input/wma/libffwma/allcodecs.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/allcodecs.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #include "avcodec.h"
--- a/Plugins/Input/wma/libffwma/allformats.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/allformats.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avformat.h"
 
--- a/Plugins/Input/wma/libffwma/asf.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/asf.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avcodec.h"
 #include "avformat.h"
--- a/Plugins/Input/wma/libffwma/asfheader.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/asfheader.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA
  *
  * $Id: asfheader.h,v 1.2 2005/12/12 09:24:19 theuraeus Exp $
  *
--- a/Plugins/Input/wma/libffwma/avio.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/avio.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avformat.h"
 #include "cutils.h"
--- a/Plugins/Input/wma/libffwma/aviobuf.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/aviobuf.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avformat.h"
 #include "avio.h"
--- a/Plugins/Input/wma/libffwma/bswap.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/bswap.h	Wed Aug 02 15:44:07 2006 -0700
@@ -147,7 +147,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
  */
 
 
--- a/Plugins/Input/wma/libffwma/common.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/common.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at>
  */
--- a/Plugins/Input/wma/libffwma/cutils.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/cutils.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avformat.h"
 
--- a/Plugins/Input/wma/libffwma/dsputil.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/dsputil.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  *
  * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
  */
--- a/Plugins/Input/wma/libffwma/dsputil.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/dsputil.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 /**
--- a/Plugins/Input/wma/libffwma/fft.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/fft.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 /**
--- a/Plugins/Input/wma/libffwma/file.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/file.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avformat.h"
 #include "cutils.h"
--- a/Plugins/Input/wma/libffwma/futils.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/futils.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avformat.h"
 #include "avcodec.h"
--- a/Plugins/Input/wma/libffwma/mdct.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/mdct.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "dsputil.h"
 
--- a/Plugins/Input/wma/libffwma/mms.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/mms.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA
  *
  * $Id: mms.c,v 1.21 2006/07/13 12:32:20 shawarma Exp $
  *
--- a/Plugins/Input/wma/libffwma/mms.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/mms.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA
  *
  * $Id: mms.h,v 1.11 2006/06/06 09:49:15 shawarma Exp $
  *
--- a/Plugins/Input/wma/libffwma/mmsh.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/mmsh.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA
  *
  * $Id: mmsh.c,v 1.5 2006/07/13 12:32:20 shawarma Exp $
  *
--- a/Plugins/Input/wma/libffwma/mmsh.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/mmsh.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307, USA
  *
  * $Id: mmsh.h,v 1.4 2006/06/06 09:52:28 shawarma Exp $
  *
--- a/Plugins/Input/wma/libffwma/os_support.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/os_support.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avformat.h"
 
--- a/Plugins/Input/wma/libffwma/parser.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/parser.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 #include "avcodec.h"
 #include "utils.h"
--- a/Plugins/Input/wma/libffwma/simple_idct.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/simple_idct.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
  
 /**
--- a/Plugins/Input/wma/libffwma/simple_idct.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/simple_idct.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 /**
--- a/Plugins/Input/wma/libffwma/uri.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/uri.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02111-1307, USA.
  */
 
--- a/Plugins/Input/wma/libffwma/uri.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/uri.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the 
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02111-1307, USA.
  */
 
--- a/Plugins/Input/wma/libffwma/utils.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/utils.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
  
 #include "avcodec.h"
--- a/Plugins/Input/wma/libffwma/wmadec.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/libffwma/wmadec.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 /**
--- a/Plugins/Input/wma/wma.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Input/wma/wma.c	Wed Aug 02 15:44:07 2006 -0700
@@ -20,7 +20,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #include <stdlib.h>
 #include <malloc.h>
--- a/Plugins/Output/OSS/OSS.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/OSS.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "OSS.h"
--- a/Plugins/Output/OSS/OSS.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/OSS.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef OSS_H
--- a/Plugins/Output/OSS/about.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/about.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "OSS.h"
@@ -50,7 +50,7 @@
                                  "\n"
                                  "You should have received a copy of the GNU General Public License\n"
                                  "along with this program; if not, write to the Free Software\n"
-                                 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
+                                 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,\n"
                                  "USA."), _("Ok"), FALSE, NULL, NULL);
     g_signal_connect(G_OBJECT(dialog), "destroy",
                      G_CALLBACK(gtk_widget_destroyed), &dialog);
--- a/Plugins/Output/OSS/audio.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/audio.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
--- a/Plugins/Output/OSS/configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "OSS.h"
--- a/Plugins/Output/OSS/convert.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/convert.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "OSS.h"
--- a/Plugins/Output/OSS/init.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/init.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
--- a/Plugins/Output/OSS/mixer.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/OSS/mixer.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 
--- a/Plugins/Output/alsa/about.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/alsa/about.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "alsa.h"
@@ -41,7 +41,7 @@
 		  "\n"
 		  "You should have received a copy of the GNU General Public License\n"
 		  "along with this program; if not, write to the Free Software\n"
-		  "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
+		  "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,\n"
 		  "USA.\n"
 		  "Author: Matthieu Sozeau (mattam@altern.org)"), _("OK"), FALSE, NULL, NULL);
 	gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
--- a/Plugins/Output/alsa/alsa.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/alsa/alsa.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "alsa.h"
--- a/Plugins/Output/alsa/alsa.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/alsa/alsa.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef ALSA_H
 #define ALSA_H
--- a/Plugins/Output/alsa/audio.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/alsa/audio.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 /*
--- a/Plugins/Output/alsa/configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/alsa/configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #include "alsa.h"
 #include <stdio.h>
--- a/Plugins/Output/alsa/init.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/alsa/init.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #include "audacious/main.h"
 #include "alsa.h"
--- a/Plugins/Output/arts/convert.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/arts/convert.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #if defined(HAVE_CONFIG_H)
--- a/Plugins/Output/disk_writer/disk_writer.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/disk_writer/disk_writer.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
--- a/Plugins/Output/esd/about.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/esd/about.c	Wed Aug 02 15:44:07 2006 -0700
@@ -45,7 +45,7 @@
                                  "\n"
                                  "You should have received a copy of the GNU General Public License\n"
                                  "along with this program; if not, write to the Free Software\n"
-                                 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
+                                 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,\n"
                                  "USA."), _("Ok"), FALSE, NULL, NULL);
     g_signal_connect(G_OBJECT(dialog), "destroy",
                      G_CALLBACK(gtk_widget_destroyed), &dialog);
--- a/Plugins/Output/esd/audio.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/esd/audio.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
--- a/Plugins/Output/esd/configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/esd/configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "esdout.h"
--- a/Plugins/Output/esd/esdout.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/esd/esdout.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef ESDOUT_H
--- a/Plugins/Output/esd/mixer.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/esd/mixer.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <stdio.h>
--- a/Plugins/Output/jack/bio2jack.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/jack/bio2jack.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 /* NOTE: All functions that take a jack_driver_t* do NOT lock the device, in order to get a */
--- a/Plugins/Output/jack/bio2jack.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/jack/bio2jack.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1307  USA
  */
 
 #ifndef _H_JACK_OUT_H
--- a/Plugins/Output/jack/configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/jack/configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  *
  *  Contains code Copyright (C) 1998-2000 Mikael Alm, Olle Hallnas,
  *  Thomas Nillson, 4Front Technologies and Galex Yen
--- a/Plugins/Output/sun/about.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/about.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "sun.h"
--- a/Plugins/Output/sun/audio.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/audio.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 /* FIXME: g_error() is used several places, it will exit xmms */
--- a/Plugins/Output/sun/configure.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/configure.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <errno.h>
--- a/Plugins/Output/sun/convert.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/convert.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "sun.h"
--- a/Plugins/Output/sun/mixer.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/mixer.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "sun.h"
--- a/Plugins/Output/sun/mixer.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/mixer.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 int	sun_mixer_open(void);
--- a/Plugins/Output/sun/resample.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/resample.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #define NOT_NATIVE_ENDIAN						\
--- a/Plugins/Output/sun/sun.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/sun.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "sun.h"
--- a/Plugins/Output/sun/sun.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Output/sun/sun.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
--- a/Plugins/Visualization/blur_scope/Makefile.in	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Visualization/blur_scope/Makefile.in	Wed Aug 02 15:44:07 2006 -0700
@@ -7,9 +7,7 @@
 
 LIBADD = $(GTK_LIBS)
 
-COMMON_SRC = blur_scope.c config.c
-
-SOURCES = $(COMMON_SRC)
+SOURCES = blur_scope.c config.c
 
 OBJECTS = ${SOURCES:.c=.o}
 
--- a/Plugins/Visualization/blur_scope/blur_scope.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Visualization/blur_scope/blur_scope.c	Wed Aug 02 15:44:07 2006 -0700
@@ -17,7 +17,7 @@
  *  You should have received a copy of the GNU General Public License
  *  w
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/Plugins/Visualization/rocklight/rocklight.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Visualization/rocklight/rocklight.c	Wed Aug 02 15:44:07 2006 -0700
@@ -20,7 +20,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
  
 #include "audacious/plugin.h"
--- a/Plugins/Visualization/rocklight/thinklight.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Visualization/rocklight/thinklight.c	Wed Aug 02 15:44:07 2006 -0700
@@ -20,7 +20,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
  
 #include <sys/types.h>
--- a/Plugins/Visualization/rocklight/thinklight.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/Plugins/Visualization/rocklight/thinklight.h	Wed Aug 02 15:44:07 2006 -0700
@@ -20,7 +20,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
  
 #ifndef _THINKLIGHT_H
--- a/audacious/about.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/about.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/controlsocket.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/controlsocket.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "controlsocket.h"
--- a/audacious/controlsocket.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/controlsocket.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef CONTROLSOCKET_H
--- a/audacious/credits.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/credits.c	Wed Aug 02 15:44:07 2006 -0700
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/dnd.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/dnd.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <gtk/gtk.h>
--- a/audacious/dock.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/dock.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "dock.h"
--- a/audacious/dock.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/dock.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef DOCK_H
--- a/audacious/effect.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/effect.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "effect.h"
--- a/audacious/effect.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/effect.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef EFFECT_H
--- a/audacious/eq_graph.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/eq_graph.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "eq_graph.h"
--- a/audacious/eq_graph.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/eq_graph.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef EQ_GRAPH_H
--- a/audacious/eq_slider.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/eq_slider.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "eq_slider.h"
--- a/audacious/eq_slider.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/eq_slider.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef EQ_SLIDER_H
 #define EQ_SLIDER_H
--- a/audacious/equalizer.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/equalizer.c	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/equalizer.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/equalizer.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef EQUALIZER_H
--- a/audacious/fft.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/fft.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 /*
--- a/audacious/fft.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/fft.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef _FFT_H_
--- a/audacious/general.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/general.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
--- a/audacious/general.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/general.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef GENERIC_H
--- a/audacious/genevent.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/genevent.c	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/genevent.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/genevent.h	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef GENEVENT_H
--- a/audacious/getopt.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/getopt.c	Wed Aug 02 15:44:07 2006 -0700
@@ -21,7 +21,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1307, USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
--- a/audacious/getopt.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/getopt.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1307, USA.  */
 
 #ifndef _GETOPT_H
--- a/audacious/getopt1.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/getopt1.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/glade.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/glade.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef HAVE_CONFIG_H
--- a/audacious/glade.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/glade.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef BMP_GLADE_H
--- a/audacious/hints.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/hints.c	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "hints.h"
--- a/audacious/hints.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/hints.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef HINTS_H
--- a/audacious/hslider.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/hslider.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "hslider.h"
--- a/audacious/hslider.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/hslider.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef HSLIDER_H
 #define HSLIDER_H
--- a/audacious/input.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/input.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/input.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/input.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef INPUT_H
--- a/audacious/logger.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/logger.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/logger.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/logger.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef LOGGER_H
--- a/audacious/main.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/main.c	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/main.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/main.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef MAIN_H
--- a/audacious/mainwin.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/mainwin.c	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/mainwin.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/mainwin.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef MAINWIN_H
--- a/audacious/menurow.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/menurow.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "menurow.h"
--- a/audacious/menurow.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/menurow.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef MENUROW_H
 #define	MENUROW_H
--- a/audacious/monostereo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/monostereo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "monostereo.h"
--- a/audacious/monostereo.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/monostereo.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef MONOSTEREO_H
 #define MONOSTEREO_H
--- a/audacious/number.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/number.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "number.h"
--- a/audacious/number.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/number.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef NUMBER_H
 #define NUMBER_H
--- a/audacious/output.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/output.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/output.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/output.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef OUTPUT_H
--- a/audacious/pbutton.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/pbutton.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "pbutton.h"
--- a/audacious/pbutton.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/pbutton.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef PBUTTON_H
 #define PBUTTON_H
--- a/audacious/playback.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playback.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/playback.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playback.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef PLAYBACK_H
--- a/audacious/playlist.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playlist.h	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef PLAYLIST_H
 #define PLAYLIST_H
--- a/audacious/playlist_list.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playlist_list.c	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 /*
--- a/audacious/playlist_list.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playlist_list.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef PLAYLIST_LIST_H
--- a/audacious/playlist_slider.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playlist_slider.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "playlist_slider.h"
--- a/audacious/playlist_slider.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playlist_slider.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef PLAYLIST_SLIDER_H
--- a/audacious/playstatus.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playstatus.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "playstatus.h"
--- a/audacious/playstatus.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/playstatus.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef PLAYSTATUS_H
 #define PLAYSTATUS_H
--- a/audacious/pluginenum.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/pluginenum.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/pluginenum.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/pluginenum.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef PLUGINENUM_H
 #define PLUGINENUM_H
--- a/audacious/prefswin.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/prefswin.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/prefswin.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/prefswin.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef PREFSWIN_H
--- a/audacious/sbutton.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/sbutton.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "sbutton.h"
--- a/audacious/sbutton.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/sbutton.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef SBUTTON_H
--- a/audacious/skin.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/skin.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/skin.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/skin.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef SKIN_H
--- a/audacious/skinwin.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/skinwin.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/skinwin.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/skinwin.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef SKINWIN_H
--- a/audacious/softvolume.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/softvolume.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <libaudacious/configdb.h>
--- a/audacious/softvolume.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/softvolume.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef SOFTVOLUME_H
--- a/audacious/svis.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/svis.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "svis.h"
--- a/audacious/svis.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/svis.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef SVIS_H
 #define SVIS_H
--- a/audacious/tbutton.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/tbutton.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "tbutton.h"
--- a/audacious/tbutton.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/tbutton.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef TBUTTON_H
--- a/audacious/textbox.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/textbox.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "textbox.h"
--- a/audacious/textbox.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/textbox.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef TEXTBOX_H
--- a/audacious/titlestring.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/titlestring.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1307, USA.
  *                
  */
--- a/audacious/ui_fileinfo.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/ui_fileinfo.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/audacious/ui_fileinfo.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/ui_fileinfo.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef _UI_FILEINFO_H_
--- a/audacious/ui_playlist.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/ui_playlist.c	Wed Aug 02 15:44:07 2006 -0700
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "ui_playlist.h"
--- a/audacious/ui_playlist.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/ui_playlist.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef PLAYLISTWIN_H
--- a/audacious/urldecode.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/urldecode.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "urldecode.h"
--- a/audacious/urldecode.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/urldecode.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <glib.h>
--- a/audacious/util.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/util.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #define WEIRD_UTF_16_PLAYLIST_ENCODING
--- a/audacious/util.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/util.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef UTIL_H
--- a/audacious/vis.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/vis.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "vis.h"
--- a/audacious/vis.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/vis.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef VIS_H
 #define VIS_H
--- a/audacious/visualization.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/visualization.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "visualization.h"
--- a/audacious/visualization.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/visualization.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef VISUALIZATION_H
 #define VISUALIZATION_H
--- a/audacious/widget.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/widget.c	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "widget.h"
--- a/audacious/widget.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audacious/widget.h	Wed Aug 02 15:44:07 2006 -0700
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef WIDGET_H
 #define WIDGET_H
--- a/audtool/audtool.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/audtool/audtool.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include <stdlib.h>
--- a/audtool/audtool.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/audtool/audtool.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef AUDTOOL_H
--- a/config.guess	Wed Aug 02 14:26:56 2006 -0700
+++ b/config.guess	Wed Aug 02 15:44:07 2006 -0700
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-03-24'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -66,11 +69,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -213,55 +216,23 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -314,40 +285,43 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -355,32 +329,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
+	exit ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -389,10 +363,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -404,10 +378,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -418,40 +392,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -475,32 +449,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -516,29 +491,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -546,7 +521,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -561,14 +536,18 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -582,28 +561,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -665,9 +644,19 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -675,11 +664,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -707,161 +696,179 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    amd64:CYGWIN*:*:*)
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -878,8 +885,12 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -897,15 +908,22 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-${LIBC}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-${LIBC}
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -919,7 +937,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -927,25 +945,28 @@
 	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
 	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-${LIBC}
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -963,17 +984,18 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
-		exit 0 ;;
+		exit ;;
 	esac
-	if [ "`echo $LIBC | sed -e 's:uclibc::'`" != "$LIBC" ] ; then echo "$TENTATIVE" && exit 0 ; fi
+	# This should get integrated into the C code below, but now we hack
+	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -989,7 +1011,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -999,16 +1021,23 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -1016,27 +1045,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1044,15 +1073,16 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1070,73 +1100,73 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1144,69 +1174,72 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1214,25 +1247,25 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1243,41 +1276,47 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
 	esac ;;
     *:XENIX:*:SysV)
 	echo i386-pc-xenix
-	exit 0 ;;
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1309,7 +1348,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1398,11 +1437,12 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1411,22 +1451,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
--- a/config.rpath	Wed Aug 02 14:26:56 2006 -0700
+++ b/config.rpath	Wed Aug 02 15:44:07 2006 -0700
@@ -2,28 +2,13 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2003 Free Software Foundation, Inc.
+#   Copyright 1996-2006 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#   As a special exception to the GNU General Public License, if you
-#   distribute this file as part of a program that contains a
-#   configuration script generated by Autoconf, you may include it under
-#   the same distribution terms that you use for the rest of that program.
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -40,7 +25,7 @@
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -50,6 +35,18 @@
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
 wl=
@@ -60,6 +57,13 @@
     aix*)
       wl='-Wl,'
       ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
     mingw* | pw32* | os2*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -71,12 +75,25 @@
     newsos6)
       ;;
     linux*)
-      case $CC in
-        icc|ecc)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
           wl='-Wl,'
           ;;
-        ccc)
-          wl='-Wl,'
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
           ;;
       esac
       ;;
@@ -96,6 +113,9 @@
       ;;
     sysv4*MP*)
       ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
     uts4*)
       ;;
   esac
@@ -117,6 +137,10 @@
       with_gnu_ld=no
     fi
     ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
   openbsd*)
     with_gnu_ld=no
     ;;
@@ -124,6 +148,12 @@
 
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
     aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
@@ -138,12 +168,12 @@
       # that the semantics of dynamic libraries on AmigaOS, at least up
       # to version 4, is to share data among multiple programs linked
       # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
+      # behavior of shared libraries on other platforms, we cannot use
       # them.
       ld_shlibs=no
       ;;
     beos*)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -159,32 +189,55 @@
         ld_shlibs=no
       fi
       ;;
-    netbsd*)
+    interix3*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       ;;
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-        ld_shlibs=no
-      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
       fi
       ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
     sunos4*)
       hardcode_direct=yes
       ;;
     *)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
       fi
       ;;
   esac
-  if test "$ld_shlibs" = yes; then
-    # Unlike libtool, we use -rpath here, not --rpath, since the documented
-    # option of GNU ld is called -rpath, not --rpath.
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
   fi
 else
   case "$host_os" in
@@ -215,6 +268,7 @@
               break
             fi
           done
+          ;;
         esac
       fi
       hardcode_direct=yes
@@ -234,6 +288,7 @@
             hardcode_libdir_flag_spec='-L$libdir'
             hardcode_libdir_separator=
           fi
+          ;;
         esac
       fi
       # Begin _LT_AC_SYS_LIBPATH_AIX.
@@ -266,7 +321,7 @@
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
-    bsdi4*)
+    bsdi[45]*)
       ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
@@ -277,8 +332,17 @@
       libext=lib
       ;;
     darwin* | rhapsody*)
-      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-        hardcode_direct=no
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
       fi
       ;;
     dgux*)
@@ -295,7 +359,7 @@
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -307,24 +371,25 @@
       # but as the default location of the library.
       hardcode_minus_L=yes
       ;;
-    hpux10* | hpux11*)
+    hpux10*)
       if test "$with_gnu_ld" = no; then
-        case "$host_cpu" in
-          hppa*64*)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
             hardcode_direct=no
             ;;
-          ia64*)
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_direct=no
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
-            ;;
           *)
-            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-            hardcode_libdir_separator=:
             hardcode_direct=yes
             # hardcode_minus_L: Not really in the search PATH,
             # but as the default location of the library.
@@ -378,8 +443,6 @@
       fi
       hardcode_libdir_separator=:
       ;;
-    sco3.2v5*)
-      ;;
     solaris*)
       hardcode_libdir_flag_spec='-R$libdir'
       ;;
@@ -408,14 +471,11 @@
         ld_shlibs=yes
       fi
       ;;
-    sysv4.2uw2*)
-      hardcode_direct=yes
-      hardcode_minus_L=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
       ;;
-    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
       ;;
     uts4*)
       hardcode_libdir_flag_spec='-L$libdir'
@@ -438,7 +498,7 @@
     ;;
   beos*)
     ;;
-  bsdi4*)
+  bsdi[45]*)
     ;;
   cygwin* | mingw* | pw32*)
     shrext=.dll
@@ -450,12 +510,14 @@
     ;;
   freebsd1*)
     ;;
-  freebsd*)
+  kfreebsd*-gnu)
+    ;;
+  freebsd* | dragonfly*)
     ;;
   gnu*)
     ;;
   hpux9* | hpux10* | hpux11*)
-    case "$host_cpu" in
+    case $host_cpu in
       ia64*)
         shrext=.so
         ;;
@@ -467,6 +529,8 @@
         ;;
     esac
     ;;
+  interix3*)
+    ;;
   irix5* | irix6* | nonstopux*)
     case "$host_os" in
       irix5* | nonstopux*)
@@ -486,11 +550,13 @@
     ;;
   linux*)
     ;;
+  knetbsd*-gnu)
+    ;;
   netbsd*)
     ;;
   newsos6)
     ;;
-  nto-qnx)
+  nto-qnx*)
     ;;
   openbsd*)
     ;;
@@ -500,16 +566,16 @@
     ;;
   osf3* | osf4* | osf5*)
     ;;
-  sco3.2v5*)
-    ;;
   solaris*)
     ;;
   sunos4*)
     ;;
-  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  sysv4 | sysv4.3*)
     ;;
   sysv4*MP*)
     ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    ;;
   uts4*)
     ;;
 esac
@@ -519,7 +585,7 @@
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"
--- a/config.sub	Wed Aug 02 14:26:56 2006 -0700
+++ b/config.sub	Wed Aug 02 15:44:07 2006 -0700
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-02-10'
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -83,11 +85,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +101,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,8 +120,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -170,6 +173,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -186,6 +193,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -230,14 +241,16 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx | dvp \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +259,7 @@
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -253,19 +267,21 @@
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
-	| mips64r5900 | mips64r5900el \
 	| mn10200 | mn10300 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | dvp | thumb | tic4x | tic80 | tron \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
@@ -279,6 +295,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -298,8 +317,8 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -309,7 +328,7 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -320,6 +339,7 @@
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,19 +347,21 @@
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
-	| mips64r5900-* | mips64r5900el-* \
 	| mmix-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -703,6 +725,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -778,9 +803,8 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -811,6 +835,12 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -867,6 +897,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1106,13 +1140,10 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1185,20 +1216,23 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -irx*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -irx*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1216,7 +1250,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1350,6 +1384,9 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1359,9 +1396,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1405,6 +1442,9 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1576,7 +1616,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/intl/Makefile.in	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/Makefile.in	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
 # USA.
 
 PACKAGE = @PACKAGE@
--- a/intl/bindtextdom.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/bindtextdom.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/config.charset	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/config.charset	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
 #
 #   You should have received a copy of the GNU Library General Public
 #   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
 #   USA.
 #
 # The table consists of lines of the form
--- a/intl/dcgettext.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/dcgettext.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/dcigettext.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/dcigettext.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
--- a/intl/dcngettext.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/dcngettext.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/dgettext.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/dgettext.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/dngettext.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/dngettext.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/eval-plural.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/eval-plural.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef STATIC
--- a/intl/explodename.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/explodename.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/finddomain.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/finddomain.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/gettext.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/gettext.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/gettextP.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/gettextP.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _GETTEXTP_H
--- a/intl/gmo.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/gmo.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _GETTEXT_H
--- a/intl/hash-string.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/hash-string.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* @@ end of prolog @@ */
--- a/intl/intl-compat.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/intl-compat.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/l10nflist.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/l10nflist.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
--- a/intl/libgnuintl.h.in	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/libgnuintl.h.in	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _LIBINTL_H
--- a/intl/loadinfo.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/loadinfo.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _LOADINFO_H
--- a/intl/loadmsgcat.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/loadmsgcat.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
--- a/intl/localcharset.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/localcharset.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
--- a/intl/localcharset.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/localcharset.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _LOCALCHARSET_H
--- a/intl/locale.alias	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/locale.alias	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
 # USA.
 
 # The format of this file is the same as for the corresponding file of
--- a/intl/localealias.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/localealias.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
--- a/intl/localename.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/localename.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
--- a/intl/log.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/log.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
--- a/intl/ngettext.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/ngettext.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/os2compat.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/os2compat.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #define OS2_AWARE
--- a/intl/os2compat.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/os2compat.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* When included from os2compat.h we need all the original definitions */
--- a/intl/osdep.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/osdep.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #if defined __EMX__
--- a/intl/plural-exp.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/plural-exp.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/intl/plural-exp.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/plural-exp.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _PLURAL_EXP_H
--- a/intl/plural.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/plural.c	Wed Aug 02 15:44:07 2006 -0700
@@ -34,7 +34,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
@@ -339,7 +339,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
--- a/intl/plural.y	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/plural.y	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
--- a/intl/ref-add.sin	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/ref-add.sin	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 #
 #   You should have received a copy of the GNU Library General Public
 #   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
 #   USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
--- a/intl/ref-del.sin	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/ref-del.sin	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 #
 #   You should have received a copy of the GNU Library General Public
 #   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
 #   USA.
 #
 # Written by Bruno Haible <haible@clisp.cons.org>.
--- a/intl/relocatable.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/relocatable.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 
--- a/intl/relocatable.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/relocatable.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifndef _RELOCATABLE_H
--- a/intl/textdomain.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/intl/textdomain.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307,
    USA.  */
 
 #ifdef HAVE_CONFIG_H
--- a/libaudacious/beepctrl.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/beepctrl.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/libaudacious/beepctrl.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/beepctrl.h	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef XMMS_XMMSCTRL_H
 #define XMMS_XMMSCTRL_H
--- a/libaudacious/configdb_gconf.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/configdb_gconf.c	Wed Aug 02 15:44:07 2006 -0700
@@ -10,7 +10,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "configdb.h"
--- a/libaudacious/configdb_rcfile.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/configdb_rcfile.c	Wed Aug 02 15:44:07 2006 -0700
@@ -10,7 +10,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/libaudacious/configdb_xmlfile.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/configdb_xmlfile.c	Wed Aug 02 15:44:07 2006 -0700
@@ -10,7 +10,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/libaudacious/configfile.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/configfile.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #if defined(HAVE_CONFIG_H)
--- a/libaudacious/configfile.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/configfile.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef XMMS_CONFIGFILE_H
 #define XMMS_CONFIGFILE_H
--- a/libaudacious/dirbrowser.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/dirbrowser.c	Wed Aug 02 15:44:07 2006 -0700
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H
--- a/libaudacious/dirbrowser.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/dirbrowser.h	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef XMMS_DIRBROWSER_H
 #define XMMS_DIRBROWSER_H
--- a/libaudacious/rcfile.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/rcfile.c	Wed Aug 02 15:44:07 2006 -0700
@@ -10,7 +10,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "rcfile.h"
--- a/libaudacious/rcfile.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/rcfile.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 #ifndef RCFILE_H
 #define RCFILE_H
--- a/libaudacious/titlestring.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/titlestring.c	Wed Aug 02 15:44:07 2006 -0700
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1307, USA.
  *
  */
--- a/libaudacious/titlestring.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/titlestring.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02111-1307, USA.
  *                
  */
--- a/libaudacious/vfs_gnome.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/vfs_gnome.c	Wed Aug 02 15:44:07 2006 -0700
@@ -10,7 +10,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "vfs.h"
--- a/libaudacious/vfs_stdio.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/vfs_stdio.c	Wed Aug 02 15:44:07 2006 -0700
@@ -10,7 +10,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "vfs.h"
--- a/libaudacious/xentry.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/xentry.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02111-1307, USA.
  */
 
--- a/libaudacious/xentry.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/xentry.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02111-1307, USA.
  */
 
--- a/libaudacious/xml_document.c	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/xml_document.c	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #include "xml_document.h"
--- a/libaudacious/xml_document.h	Wed Aug 02 14:26:56 2006 -0700
+++ b/libaudacious/xml_document.h	Wed Aug 02 15:44:07 2006 -0700
@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  */
 
 #ifndef XML_DOCUMENT_H