[amarok/f13/master: 23/23] Merge branch 'master' into f13

[Rex Dieter]

commit fa2934b4938361d120519709458afa7f3414e5e2
Merge: 19b81be a0dc2f7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 16 14:17:04 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	amarok.spec
    	sources

 .gitignore                                         |    2 +-
 0001-Move-some-code-in-TrayIcon-class.patch        |   85 -------
 0002-Some-TrayIcon-changes.patch                   |  251 -------------------
 ...-not-update-cover-each-time-we-update-the.patch |  258 --------------------
 ...e-redundant-debug-output.-Update-copyrigh.patch |   52 ----
 amarok-2.3.1-glib26_signals_fix.patch              |   14 -
 amarok.spec                                        |   38 ++--
 sources                                            |    2 +-
 8 files changed, 25 insertions(+), 677 deletions(-)
---