[pcp/f13: 2/2] Merge branch 'master' into f13

[Mark Goodwin]

commit 3b9c7fa9436724f0b6c448d406974e98299d8319
Merge: 94bc2bd 9e8a202
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Thu Dec 15 15:32:30 2011 +1100

    Merge branch 'master' into f13

 .gitignore |    3 +++
 pcp.spec   |    8 +++++++-
 sources    |    4 +++-
 3 files changed, 13 insertions(+), 2 deletions(-)
---