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

[Rex Dieter]

commit dfe4db78486e2bea584c98c748ac8d10b5ddad12
Merge: e39385b 3653e8a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Nov 25 06:22:58 2010 -0600

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore
    	phonon.spec
    	sources

 .gitignore         |   17 ++++++++---------
 phonon.spec        |   26 ++++++++++++++++++++++++--
 phonon_snapshot.sh |    8 +++++---
 sources            |    2 +-
 4 files changed, 38 insertions(+), 15 deletions(-)
---