[folks/f15/master: 3/3] Fix merge errors.

[Brian Pepple]

commit 3a76e185085daa35061f94583ab0de741b2ed1ed
Merge: 0fc5076 bd4b1d9
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Mar 17 13:48:09 2011 -0400

    Fix merge errors.

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