commit 647d46b9f887bbc957422fcea1833b2f060a952b Merge: d4115c7 9e8a202 Author: Mark Goodwin <mgoodwin at redhat.com> Date: Thu Dec 15 15:32:17 2011 +1100 Merge branch 'master' into el6 .gitignore | 3 +++ pcp.spec | 8 +++++++- sources | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) ---