[pcs: 2/2] Merge branch 'f18'

[cfeist]

commit 7d9b392d961ea9f994fa3625bc9f361f444b7a2f
Merge: fabee55 0676999
Author: Chris Feist <cfeist at redhat.com>
Date:   Thu Feb 21 18:26:15 2013 -0600

    Merge branch 'f18'
    
    Conflicts:
    	pcs.spec

 .gitignore |    1 +
 pcs.spec   |   19 ++++++++-----------
 sources    |    3 +--
 3 files changed, 10 insertions(+), 13 deletions(-)
---