[pacemaker/f18: 2/2] Merge branch 'master' into f18

[Jon Ciesla]

commit d4a7d6b508ff3114eb99e080b602cc1ef107c99f
Merge: aea436d 8b6d949
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Aug 31 15:10:59 2012 -0500

    Merge branch 'master' into f18

 pacemaker.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---