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

[Michael Schwendt]

commit 549662749d33937c711312cec467908e04b58fb8
Merge: dcbdead c85e2cb
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Nov 6 12:11:23 2010 +0100

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

 audacious-2.4.0-vfs_file_get_contents.patch |   13 +++++++++++++
 audacious.spec                              |   11 +++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---