[pcp/f13: 9/9] Update to 3.5.11-1

[Mark Goodwin]

commit 3433990564d1cb358619d8408c231068746641d7
Merge: 149cf4c 657df18
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Mon Dec 12 20:06:49 2011 +1100

    Update to 3.5.11-1

 .gitignore |    5 ++
 pcp.spec   |  163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 sources    |    2 +-
 3 files changed, 164 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 2a1a593,f8bff05..9239262
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,6 @@@
  pcp-3.3.3-1.src.tar.gz
++<<<<<<< HEAD
++=======
+ /pcp-3.5.0-1.src.tar.gz
+ /pcp-3.5.11-1.src.tar.gz
++>>>>>>> master