Merge branch 'topic-udpu'

Conflicts:
	Makefile.am

Signed-off-by: Steven Dake <sdake@redhat.com>

diff --cc Makefile.am
index fc7a4f196920f52a1e7220e47d74a4503b340c24,d70723533fd92312dbc7709351639b21a238e13b..cbc47d0b457b7c62f7f6d4bb7d176bc79d5107e3
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -33,13 -33,9 +33,14 @@@ SPEC                        = $(PACKAGE_NAME).spe
  
  TARFILE                       = $(PACKAGE_NAME)-$(VERSION).tar.gz
  
 -EXTRA_DIST            = autogen.sh conf/corosync.conf.example conf/corosync.conf.example.udpu  \
 -                      $(SPEC).in conf/lenses/tests/test_corosync.aug \
 -                      conf/lenses/corosync.aug
 +EXTRA_DIST            = autogen.sh conf/corosync.conf.example $(SPEC).in \
 +                        build-aux/git-version-gen \
 +                        build-aux/gitlog-to-changelog \
 +                        build-aux/release.mk \
 +                        conf/lenses/tests/test_corosync.aug \
 +                        conf/lenses/corosync.aug \
++                        conf/corosync.conf.example.udpu \
 +                        .version
  
  AUTOMAKE_OPTIONS      = foreign
  

diff --cc corosync.spec.in
Simple merge