commit 280536e9032416b919ef218f3f3c9e835b985818 Merge: 1c2a6fe 16e75eb Author: Nathan Scott <nathans at redhat.com> Date: Fri Sep 14 22:26:05 2012 +1000 Merge branch 'master' into el5 .gitignore | 1 + pcp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) ---