Fix merge bugs from changeset 1.23.

BKrev: 40edb2ddF4jV4bxQYmbXj7nCSPCe2w


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@81 fd59a12c-fef9-0310-b244-a6a79926bd2f