[rhythmbox/gobject-introspection: 9/41] Merge branch 'master' into gobject-introspection

[Jonathan Matthew <jmatthew src gnome org>]

commit 47681369afc1f3c34378ef0eddafad0dc2d8b047
Merge: 43d363b f9502f5
Author: Jonathan Matthew <jonathan d14n org>
Date:   Mon Nov 22 11:45:10 2010 +1000

    Merge branch 'master' into gobject-introspection

 help/Makefile.am                                   |    2 +-
 help/ro/ro.po                                      | 2687 ++++++++++++++++++++
 .../rb-audioscrobbler-profile-page.c               |   35 +-
 plugins/status-icon/Makefile.am                    |    1 +
 plugins/status-icon/rb-status-icon-plugin.c        |   69 +-
 plugins/status-icon/rb-tray-icon-gtk.c             |    2 +
 po/sl.po                                           |  842 +++---
 shell/rb-shell-player.c                            |    5 +
 sources/rb-import-errors-source.c                  |    5 +-
 9 files changed, 3200 insertions(+), 448 deletions(-)
---