commit 420d7b007ca598d68c6504ccec1015c9ac22d596 Merge: 2daeddc 70b467a Author: Nathan Scott <nathans at redhat.com> Date: Sun Sep 15 17:54:30 2013 +1000 Merge branch 'master' into el6 .gitignore | 1 + pcp.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) ---