[abcde/f13/master: 4/4] Merge branch 'master' into f13

[Ville Skyttä]

commit fe8c09e822b1b0ef6c6fa9580018d28fd84f2970
Merge: db46274 8b79e0d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Sep 26 10:21:33 2010 +0300

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    2 +-
 abcde-2.3.99.7-speex-comment.patch                 |   16 ------------
 abcde-2.3.99.7-trackinfo.patch                     |   13 ----------
 ...99.7-1ubuntu1.diff => abcde-2.4.1-tagging.patch |   19 ++++++++------
 abcde.spec                                         |   26 +++++++++----------
 sources                                            |    2 +-
 6 files changed, 25 insertions(+), 53 deletions(-)
---