[pcs/f19: 3/4] Merge branch 'f18' into f19

[cfeist]

commit 51f9320a015f6dc659c7d872fdc528c0ca911deb
Merge: 39b0854 b23d2bf
Author: Chris Feist <cfeist at redhat.com>
Date:   Mon Mar 25 14:35:02 2013 -0500

    Merge branch 'f18' into f19
    
    Conflicts:
    	pcs.spec

 .gitignore   |    1 +
 fedfix.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 pcs.spec     |   16 +++++++++++-----
 sources      |    2 +-
 4 files changed, 55 insertions(+), 6 deletions(-)
---