Index: /source/ariba/utility/misc/KeyMapping.hpp
===================================================================
--- /source/ariba/utility/misc/KeyMapping.hpp	(revision 2488)
+++ /source/ariba/utility/misc/KeyMapping.hpp	(revision 2801)
@@ -69,5 +69,5 @@
 public:
 	inline KeyMapping(){
-		srand(time(0));
+		srand( time(NULL) );
 	}
 
Index: /source/ariba/utility/system/StartupWrapper.cpp
===================================================================
--- /source/ariba/utility/system/StartupWrapper.cpp	(revision 2488)
+++ /source/ariba/utility/system/StartupWrapper.cpp	(revision 2801)
@@ -78,4 +78,10 @@
 	if( initialized ) return;
 	initialized = true;
+
+	//
+	// having seeded the pseudo rng is always good
+	//
+
+	srand( time(NULL) );
 
 	//
Index: /source/ariba/utility/types/Identifier.cpp
===================================================================
--- /source/ariba/utility/types/Identifier.cpp	(revision 2488)
+++ /source/ariba/utility/types/Identifier.cpp	(revision 2801)
@@ -598,9 +598,12 @@
 
 	//as mpn_random has no seeding function
-	// we mess aroung here a little to achive randomness
+	// we mess aroung here a little to achive some randomness
+	// using the rand function that _is_ seeded in the 
+	// StartupWrapper::initSystem function
+
 	Identifier keyRandom = ZERO;
 	mpn_random(keyRandom.key, aSize);
-	Identifier keyTime( time(NULL) );
-	mpn_mul_1( newKey.key, keyRandom.key, aSize, *keyTime.key );
+	Identifier keyrnd( rand() );
+	mpn_mul_1( newKey.key, keyRandom.key, aSize, *keyrnd.key );
 
 	newKey.trim();
@@ -608,12 +611,4 @@
 }
 
-
-// README: due to some problems with serialization the keylength
-// was changed to 192 bit! As none of the hashing functions
-// can provide 160 bit output, and we currently don't use any
-// hashing for identifiers in the demo at all ... this is all commented out!!
-
-
-// generate sha1 hash
 Identifier Identifier::sha1(const string& input) {
 	Identifier newKey;
@@ -652,6 +647,4 @@
 }
 
-
-
 // generate a key=2**exponent
 Identifier Identifier::pow2(uint exponent) {