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

[Rex Dieter]

commit 372eef2c6995de2621319047df63de55a9c1e45e
Merge: 3653e8a 223ea43
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 30 09:06:53 2010 -0600

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

 phonon-4.4.3-flac_mimetype.patch |   15 +++++++++++++++
 phonon.spec                      |    9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---