[parley/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 2ee52a6120d722974bdefe521b5f5ab1b9d52c76
Merge: 43541a0 63e7482
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:54:28 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	parley.spec
    	sources

 .gitignore  |    3 +--
 parley.spec |   29 +++++++++++++++++++++++++----
 sources     |    2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
---