commit 1658dfee70843ae0e1b3436a04875564e50ac721 Merge: 025e54a fa5faff Author: Jesse Keating <jkeating at redhat.com> Date: Mon Mar 26 15:33:33 2012 -0700 Merge branch 'master' into el6 .gitignore | 1 + rpkg.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---