[audacious/f14/master: 3/3] Merge branch 'master' into f14

[Michael Schwendt]

commit 04a420833f84ea04a71e68de22b62f19ea8fbf86
Merge: 5496627 8ed1add
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Jan 15 23:26:12 2011 +0100

    Merge branch 'master' into f14

 .gitignore                                  |    2 ++
 audacious-2.4.0-probe-file-ext-in-url.patch |   15 ---------------
 audacious-2.4.0-vfs_file_get_contents.patch |   13 -------------
 audacious.spec                              |   26 +++++++++++++++-----------
 sources                                     |    2 +-
 5 files changed, 18 insertions(+), 40 deletions(-)
---