Index: /Makefile.am
===================================================================
--- /Makefile.am	(revision 3375)
+++ /Makefile.am	(revision 3578)
@@ -1,3 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
+SUBDIRS    = docu source sample
 EXTRA_DIST = etc/* INSTALL LICENSE README bootstrap
-SUBDIRS    = docu source sample
+
+# hook to remove all .svn files before rolling the tarball
+dist-hook:
+	find $(distdir) -name '.[a-zA-Z0-9]*' | xargs rm -rf
Index: /source/ariba/Node.cpp
===================================================================
--- /source/ariba/Node.cpp	(revision 3375)
+++ /source/ariba/Node.cpp	(revision 3578)
@@ -63,6 +63,8 @@
 	const communication::EndpointDescriptor* ep =
 			ariba_mod.getBootstrapNode(vnetname);
-	if( ep == NULL ) return;
-
+	if( ep == NULL ) {
+		std::cout << "no bootstrap node defined" << std::endl;	
+		return;
+	}
 	ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
 	base_overlay->start( *ariba_mod.base_comm, nodeId );
Index: /source/ariba/Node.h
===================================================================
--- /source/ariba/Node.h	(revision 3375)
+++ /source/ariba/Node.h	(revision 3578)
@@ -49,4 +49,5 @@
 
 #include <vector>
+#include <iostream>
 #include "Module.h"
 #include "Identifiers.h"
Index: /source/ariba/utility/system/Timer.cpp
===================================================================
--- /source/ariba/utility/system/Timer.cpp	(revision 3375)
+++ /source/ariba/utility/system/Timer.cpp	(revision 3578)
@@ -102,11 +102,14 @@
 	}
 
-	obj->running = false;
+	if(! obj->oneshot )
+		obj->running = false;
 }
 #endif // UNDERLAY_OMNET
 
 void Timer::handleSystemEvent( const SystemEvent& event ) {
-	if( running )
+	if( running ){
+		if( oneshot ) running = false;
 		eventFunction();
+	}
 
 #ifdef UNDERLAY_OMNET