[pacemaker/f14/master: 6/6] Merge branch 'master' into f14

[Fabio M. Di Nitto]

commit a68f01f1d24fc2553153324df7159ca5572754da
Merge: 9ddc6ab 4d22fb1
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Wed Dec 8 11:23:51 2010 +0100

    Merge branch 'master' into f14
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 .gitignore     |    3 +--
 pacemaker.spec |   53 +++++++++++++++++++++++++++++++++++------------------
 sources        |    2 +-
 3 files changed, 37 insertions(+), 21 deletions(-)
---