[clementine/f16: 5/5] Merge branch 'master' into f16

[Orcan Ogetbil]

commit 2aa3d2550b049c4bf55a02461761e46bb9b997d8
Merge: 1b35fbb 16ee54f
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Feb 3 08:39:25 2012 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	clementine.spec

 .gitignore                        |    1 +
 clementine-desktop.patch          |   36 +++++++++++++++++++++++++++
 clementine-fresh-start.patch      |    9 -------
 clementine-glib2-2.30.patch       |   12 ---------
 clementine-glibmm24-2.30.patch    |   44 ---------------------------------
 clementine-lastfm-login-fix.patch |   27 --------------------
 clementine-system-sha2.patch      |   46 +++++++++++++++++++++++++++++++++++
 clementine.spec                   |   48 ++++++++++++++++++++-----------------
 sources                           |    2 +-
 9 files changed, 110 insertions(+), 115 deletions(-)
---