[parley/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 1a552b92962e22c7c4846ff6905903ed9c6d3a5c
Merge: 2ee52a6 b0bcb4b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:07:02 2012 -0500

    Merge branch 'master' into f16

 .gitignore  |    1 +
 parley.spec |   10 ++++++++--
 sources     |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---