[corosync: 13/13] Initial pseudo merge for dist-git setup

[Fabio M. Di Nitto]

commit d0be6f9827708bf4529e22b4cde8a5deb364e195
Merge: cd479e9 7f9f0d1 7d9ad2b
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Wed Aug 4 13:30:26 2010 +0200

    Initial pseudo merge for dist-git setup

---