[gnome-music/wip/merge: 261/343] Merge pull request #57 from kyoushuu/master

[Ignacio Casal Quinteiro <icq src gnome org>]

commit a69a9ffa06bf782a2e72e5df4647a963add15cf5
Merge: c88b59b c4d9c62
Author: Vadim Rutkovsky <roignac gmail com>
Date:   Thu Jul 18 04:40:04 2013 -0700

    Merge pull request #57 from kyoushuu/master
    
    Various fixes in resources, songs view and playback

 data/PlayerToolbar.ui          |    4 ++--
 data/gnome-music.gresource.xml |    2 +-
 gnomemusic/application.py      |    3 ++-
 gnomemusic/player.py           |    6 +++---
 gnomemusic/toolbar.py          |    2 +-
 gnomemusic/view.py             |   11 ++++++-----
 gnomemusic/widgets.py          |    8 ++++----
 7 files changed, 19 insertions(+), 17 deletions(-)
---