Steven Dake 1d7cf1a79e Merge trunk revision 2828: %!s(int64=15) %!d(string=hai) anos
..
Makefile.am a1794c3ce5 Fix merge conflicts. %!s(int64=16) %!d(string=hai) anos
corosync-cfgtool.c 94e4234c99 Fix corosync-cfgtool -a so that it actaully produces some output! %!s(int64=16) %!d(string=hai) anos
corosync-cpgtool.c f83f54b757 Merge trunk revision 2401: %!s(int64=16) %!d(string=hai) anos
corosync-fplay.c 1d7cf1a79e Merge trunk revision 2828: %!s(int64=15) %!d(string=hai) anos
corosync-keygen.c e35d38b547 Merge trunk revision 2682: %!s(int64=16) %!d(string=hai) anos
corosync-objctl.c e35d38b547 Merge trunk revision 2682: %!s(int64=16) %!d(string=hai) anos
corosync-pload.c 1f40a10983 don't include <signal.h> when it's not used %!s(int64=16) %!d(string=hai) anos
corosync-quorumtool.c b3df69a671 Merge trunk revision 2548: %!s(int64=16) %!d(string=hai) anos