[amarok/f12/master: 6/6] Merge remote branch 'origin/master' into f12/master

[Rex Dieter]

commit f8c4be1d574bddd484792e62e418886d4f399872
Merge: 7d3f6d6 b92a648
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Nov 4 11:25:45 2010 -0500

    Merge remote branch 'origin/master' into f12/master
    
    Conflicts:
    	amarok.spec

 amarok-2.3.2-appletsize.patch                   |   97 +++++++++++++++++++++++
 amarok-2.3.2-collectionscanner_decimalhex.patch |   25 ++++++
 amarok-2.3.2-ipod3.patch                        |   49 ++++++++++++
 amarok.spec                                     |   27 +++++--
 4 files changed, 192 insertions(+), 6 deletions(-)
---