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

[Rex Dieter]

commit fea8992a206ac98f44db712c2b1b9da5565ce3ac
Merge: c0491cc b92a648
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Nov 4 10:48:04 2010 -0500

    Merge remote branch 'origin/master' into f14/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                                     |   26 +++++--
 4 files changed, 190 insertions(+), 7 deletions(-)
---