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

[Rex Dieter]

commit 368b42503569628307eab9620b343812f9e22a11
Merge: 6656bb8 a83539e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 17 20:18:19 2011 -0600

    Merge remote branch 'origin/master' into f14/master

 .gitignore                                         |    1 +
 amarok-2.3.2-appletsize.patch                      |   97 --------------------
 amarok-2.3.2-collectionscanner_decimalhex.patch    |   25 -----
 amarok-2.3.2-flac_mimetype.patch                   |   27 ------
 amarok-2.3.2-ipod3.patch                           |   49 ----------
 ...-tests-for-unprintable-but-also-invalid-c.patch |   83 -----------------
 amarok-2.3.2_bpm_tags-in-flac_fix.patch            |   11 --
 amarok.spec                                        |   57 +++++++-----
 sources                                            |    2 +-
 9 files changed, 34 insertions(+), 318 deletions(-)
---