[phonon/f15: 11/11] Merge branch 'f14' into f15

[Rex Dieter]

commit 28274cc564f54ed1f40b67f2ffdb9779d849b28d
Merge: d026337 140708f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Nov 10 12:39:58 2011 -0600

    Merge branch 'f14' into f15
    
    Conflicts:
    	phonon.spec

 .gitignore  |   12 ++----------
 phonon.spec |   46 ++++++++++++++++++++--------------------------
 sources     |    2 +-
 3 files changed, 23 insertions(+), 37 deletions(-)
---