From 29920dceb8e2b9806b2dcaf1dd134081e596633d Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 22 Feb 2011 00:03:03 +0100
Subject: [PATCH] conflict resolved in cherry pick

---
 src/redis.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/redis.c b/src/redis.c
index f2bb87fd..84e5560e 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -945,6 +945,7 @@ void initServer() {
     }
 
     if (server.ds_enabled) dsInit();
+    srand(time(NULL)^getpid());
 }
 
 /* Populates the Redis Command Table starting from the hard coded list