From 2b2b174fd39ea79573573411d454c936f4a3d9c6 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Sun, 16 Mar 2014 13:36:52 -0400
Subject: [PATCH] Merge conflict.

---
 library/system/setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/system/setup b/library/system/setup
index c6583d42029..71120b72dc2 100644
--- a/library/system/setup
+++ b/library/system/setup
@@ -2305,8 +2305,8 @@ def ansible_facts(module):
 
 def run_setup(module):
 
-    setup_options = {}
-    facts = ansible_facts(module)
+    setup_options = dict(module_setup=True)
+    facts = ansible_facts()
 
     for (k, v) in facts.items():
         setup_options["ansible_%s" % k.replace('-', '_')] = v