[folks/f15/master: 2/2] Merge branch 'master' into f15

[Brian Pepple]

commit 3e394d462911f208766ff6819056c7ae141e3d9d
Merge: 3a76e18 c1b440f
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Mar 17 14:02:26 2011 -0400

    Merge branch 'master' into f15

 folks.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---