[phonon/f14/master: 7/7] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 0da1953977de2554b9abc32e8e204b7a5537ca46
Merge: 372eef2 a759d20
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 21 14:05:07 2011 -0600

    Merge remote branch 'origin/master' into f14/master

 .gitignore                                         |    1 +
 ....3.50-gstreamer-fix-seekable-query-failed.patch |   15 --
 phonon-4.4.3-flac_mimetype.patch                   |   15 --
 phonon-4.4.4-no_rpath.patch                        |   14 ++
 phonon.spec                                        |  176 ++++++++++----------
 phonon_snapshot.sh                                 |   19 +-
 sources                                            |    9 +-
 7 files changed, 109 insertions(+), 140 deletions(-)
---