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

[Jonathan Matthew <jmatthew src gnome org>]

commit cb8080bf746f8e900bd282c7009a8dda5916d066
Merge: 3c692a0 7f57420
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Jul 22 15:01:31 2010 +1000

    Merge branch 'master' into gobject-introspection

 backends/gstreamer/rb-player-gst-helper.c     |   25 ++++++++
 backends/gstreamer/rb-player-gst-helper.h     |    2 +
 backends/gstreamer/rb-player-gst-xfade.c      |    8 +--
 backends/gstreamer/rb-player-gst.c            |   10 +---
 backends/rb-player.c                          |    1 +
 backends/rb-player.h                          |    3 +-
 configure.ac                                  |    8 ++-
 help/gl/figures/rb-iradio-main.png            |  Bin 0 -> 76001 bytes
 help/gl/figures/rb-notification-area-menu.png |  Bin 0 -> 9577 bytes
 help/gl/figures/rb-notification-window.png    |  Bin 0 -> 11131 bytes
 help/gl/figures/rb-notification-zone.png      |  Bin 0 -> 4238 bytes
 help/gl/figures/rb-podcast-main.png           |  Bin 0 -> 55302 bytes
 help/gl/figures/rb-statusbar.png              |  Bin 0 -> 5433 bytes
 help/gl/figures/rb-toolbar-prevplaynext.png   |  Bin 0 -> 1549 bytes
 help/gl/figures/rb-toolbar-repeat.png         |  Bin 0 -> 4614 bytes
 help/gl/figures/rb-toolbar-shuffle.png        |  Bin 0 -> 4579 bytes
 help/gl/figures/rb-toolbar.png                |  Bin 0 -> 7469 bytes
 help/gl/figures/rb-volume-changer.png         |  Bin 0 -> 5916 bytes
 help/gl/figures/rb-window-small.png           |  Bin 0 -> 16694 bytes
 help/gl/figures/rb-window.png                 |  Bin 0 -> 84361 bytes
 help/gl/gl.po                                 |   74 +++++++++++++++++++++++++
 plugins/mpris/rb-mpris-plugin.c               |   27 +++++++--
 rhythmdb/rhythmdb-monitor.c                   |   27 +++++----
 23 files changed, 151 insertions(+), 34 deletions(-)
---