[gnome-music/wip/merge: 67/343] Rebased on gnome-music master branch

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 8db46c81f3027998307f5f7f87f750402d855e92
Author: Manish Sinha <manishsinha ubuntu com>
Date:   Sun Jul 14 14:13:34 2013 -0700

    Rebased on gnome-music master branch

 .gitignore |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1bc346e..74f8032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,7 @@ libgd/
 data/Makefile
 data/Makefile.in
 *.patch
+*.pyc
+Makefile
+gnome-music
+*.valid