[banshee/better-now-playing: 31/32] Merge branch 'master' into better-now-playing

[Alex Launi <alexlauni src gnome org>]

commit 540361db07073ea9db5f6cb621a4d134a3ede14c
Merge: 514d42e 07f1238
Author: Alex Launi <alex launi gmail com>
Date:   Thu Jun 3 16:18:38 2010 -0400

    Merge branch 'master' into better-now-playing
    
    Conflicts:
    	po/de.po

 .gitignore                                         |    1 +
 Banshee.sln                                        |    3 -
 build/m4/shamrock/mono.m4                          |   51 +-
 data/Makefile.am                                   |    2 +-
 po/cs.po                                           |   40 +-
 po/de.po                                           |   23 +-
 po/es.po                                           |  979 +++++++++++---------
 src/Backends/Banshee.Gnome/Banshee.Gnome.csproj    |    1 +
 .../GConfConfigurationClient.cs                    |    9 +
 .../Banshee.GnomeBackend/GConfProxy.cs             |  124 +++
 .../Banshee.GnomeBackend/GnomeService.cs           |    3 +
 src/Backends/Banshee.Gnome/Makefile.am             |    1 +
 src/Backends/Banshee.Osx/Banshee.Osx.csproj        |    2 +
 src/Core/Banshee.Core/Banshee.Base/SafeUri.cs      |    5 +
 .../Banshee.Core/Banshee.Collection/TrackInfo.cs   |    2 +-
 .../Banshee.Core/Banshee.Streaming/StreamTagger.cs |    5 +-
 .../DatabaseTrackInfo.cs                           |   10 +-
 .../Banshee.Database/BansheeDbFormatMigrator.cs    |   14 +-
 .../Banshee.Metadata/SaveTrackMetadataJob.cs       |   25 +-
 .../Banshee.Metadata/SaveTrackMetadataService.cs   |   44 +-
 .../Banshee.Playlist/PlaylistSource.cs             |   16 +-
 .../Banshee.SmartPlaylist/SmartPlaylistSource.cs   |   16 +-
 .../DefaultColumnController.cs                     |   13 +-
 .../Banshee.Sources.Gui/SourceSwitcherEntry.cs     |    4 +-
 .../Banshee.Audiobook/AudiobookLibrarySource.cs    |    5 +-
 .../FileSystemQueueSource.cs                       |    4 +
 .../Banshee.NotificationArea.csproj                |    1 +
 .../Banshee.SqlDebugConsole.csproj                 |    5 +
 .../Banshee.SqlDebugConsole/SqlActions.cs          |    2 +-
 src/Libraries/Hyena/Hyena.csproj                   |    6 +-
 30 files changed, 869 insertions(+), 547 deletions(-)
---