[kid3/f14/master: 4/4] Merge branch 'master' into f14

[Ville Skyttä]

commit e098151839d72eed820e63bcf99739f08ad2c69a
Merge: 118903e 06db6cf
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Mar 12 13:50:46 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	kid3.spec

 .gitignore                       |    2 +-
 kid3-1.6-qt-startupwmclass.patch |   22 +++++++++++
 kid3.spec                        |   74 +++++++++++++++++++++++++++++++++----
 sources                          |    2 +-
 4 files changed, 90 insertions(+), 10 deletions(-)
---