[banshee/hyena-submodule: 23/24] Merge branch 'master' into hyena-submodule

[Gabriel Burt <gburt src gnome org>]

commit 3c70da4449128a0a50b650070d19080fcf51602a
Merge: 6c9c79f 0d80c8e
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Thu Jun 17 14:54:04 2010 -0700

    Merge branch 'master' into hyena-submodule

 Makefile.am                                        |    2 -
 autogen.sh                                         |    2 +-
 build/m4/shamrock/gnome-doc.m4                     |    9 +-
 configure.ac                                       |    4 +-
 help/banshee.omf.in                                |    9 -
 libbanshee/banshee-player-pipeline.c               |   15 +
 libbanshee/banshee-player-private.h                |    1 +
 libbanshee/banshee-player.c                        |    7 +
 po/de.po                                           |  233 ++--
 po/fr.po                                           | 1489 ++++++++++---------
 po/hu.po                                           | 1444 ++++++++++---------
 po/pt_BR.po                                        | 1183 ++++++++-------
 po/ru.po                                           | 1546 +++++++++++---------
 po/sl.po                                           |  770 +++++-----
 .../Banshee.GStreamer/PlayerEngine.cs              |    6 +-
 src/Core/Banshee.Core/Resources/translators.xml    |    1 -
 .../Banshee.Gui.Widgets/ConnectedVolumeButton.cs   |   24 +-
 .../Banshee.Dap.MassStorage.addin.xml              |    3 +
 .../Banshee.InternetArchive/HomeSource.cs          |    6 +-
 .../InternetArchive/Details.cs                     |    5 +-
 .../InternetArchive/DetailsFile.cs                 |   18 +-
 .../Banshee.PlayQueue/PlayQueueSource.cs           |   15 +-
 src/Libraries/MusicBrainz/MusicBrainz/Disc.cs      |    1 -
 .../MusicBrainz/MusicBrainz/DiscFreeBsd.cs         |  145 ++
 src/Libraries/MusicBrainz/MusicBrainz/LocalDisc.cs |   10 +-
 .../MusicBrainz/MusicBrainz/MusicBrainzObject.cs   |   36 +-
 src/Libraries/MusicBrainz/MusicBrainz/Release.cs   |    2 +-
 src/Libraries/MusicBrainz/MusicBrainz/Track.cs     |   16 +
 src/Libraries/MusicBrainz/MusicBrainz/Utils.cs     |    3 +-
 29 files changed, 3879 insertions(+), 3126 deletions(-)
---
diff --cc autogen.sh
index 7e9ab96,01501e8..61d7afc
--- a/autogen.sh
+++ b/autogen.sh
@@@ -64,9 -64,7 +64,9 @@@ check_autotool_version $LIBTOOLIZE 1.4.
  check_autotool_version intltoolize 0.35.0
  check_autotool_version pkg-config 0.14.0
  
 +git submodule update --init
 +
- gnome-doc-prepare
+ gnome-doc-prepare --automake
  run intltoolize --force --copy
  run $LIBTOOLIZE --force --copy --automake
  run aclocal -I build/m4/banshee -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS