[banshee/dbus-sharp: 20/21] Merge remote branch 'origin/master' into dbus-sharp

[Peter James Johanson <petej src gnome org>]

commit 891dbc3f2bb06b249c98129c235724e3c79528a9
Merge: ac42a33 06f6f92
Author: Pete Johanson <peter peterjohanson com>
Date:   Thu Mar 10 19:16:33 2011 -0500

    Merge remote branch 'origin/master' into dbus-sharp

 AUTHORS                                            |    1 +
 NEWS                                               |   55 +-
 banshee.doap                                       |    8 +-
 bootstrap-bundle                                   |    2 +-
 build/build.environment.mk                         |    2 +-
 build/m4/banshee/osx.m4                            |    5 +
 build/windows/Installer.wixproj                    |    2 +-
 build/windows/InstallerDefinition.wxs              |    4 +-
 configure.ac                                       |    6 +-
 data/desktop-files/banshee-1.desktop.mime          |    1 +
 extras/README.releasing                            |    2 +-
 extras/create-contributors-paragraph               |    4 +-
 extras/make-release                                |    2 +-
 po/ca.po                                           |   41 +-
 po/he.po                                           |  546 +-
 po/lv.po                                           |11933 ++++++++++++++------
 po/pt_BR.po                                        |   29 +-
 po/ru.po                                           | 2537 +++--
 po/zh_CN.po                                        |  537 +-
 profile-configure                                  |    3 +-
 src/Backends/Banshee.Osx/Banshee.Osx.csproj        |    1 +
 src/Backends/Banshee.Osx/Makefile.am               |   15 +
 .../Banshee.Core/Banshee.Collection/AlbumInfo.cs   |    2 +-
 src/Core/Banshee.Core/Resources/contributors.xml   |    1 +
 src/Core/Banshee.Core/Resources/translators.xml    |    8 +-
 .../DatabaseAlbumListModel.cs                      |    8 +-
 .../Banshee.ServiceStack/Application.cs            |    2 +-
 .../Banshee.Collection.Gui/DataViewChildAlbum.cs   |    4 +-
 .../Banshee.NotificationArea.csproj                |    2 +-
 .../NotificationAreaService.cs                     |    5 +
 .../Banshee.UbuntuOneMusicStore.addin.xml          |    2 +-
 .../UbuntuOneMusicStoreSource.cs                   |   27 +
 src/Hyena                                          |    2 +-
 33 files changed, 10407 insertions(+), 5392 deletions(-)
---