Merge branch '1.9.1' into devel

Conflicts:
	python_apps/pypo/pypopush.py

python_apps/pypo/pypofetch.py

@@ -437,10 +437,6 @@ class PypoFetch(Thread):
     def main(self):
         logger = logging.getLogger('fetch')
 
-        while not self.init_rabbit_mq():
-            logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
-            time.sleep(5)
-
         try: os.mkdir(self.cache_dir)
         except Exception, e: pass
 
@@ -452,6 +448,11 @@ class PypoFetch(Thread):
             self.process_schedule(self.schedule_data, "scheduler", True)
         logger.info("Bootstrap complete: got initial copy of the schedule")
 
+
+        while not self.init_rabbit_mq():
+            logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
+            time.sleep(5)
+
         loops = 1        
         while True:
             logger.info("Loop #%s", loops)