Merge branch 'setup-no-dash-facts' of https://github.com/tima/ansible into devel

Conflicts:
	library/setup

setup

@@ -684,7 +684,7 @@ def run_setup(module):
     facts = ansible_facts()
 
     for (k, v) in facts.items():
-        setup_options["ansible_%s" % k] = v
+        setup_options["ansible_%s" % k.replace('-', '_')] = v
 
     # if facter is installed, and we can use --json because
     # ruby-json is ALSO installed, include facter data in the JSON
@@ -718,7 +718,7 @@ def run_setup(module):
        if ohai:
            for (k,v) in ohai_ds.items():
                if type(v) == str or type(v) == unicode:
-                    k2 = "ohai_%s" % k
+                   k2 = "ohai_%s" % k.replace('-', '_')
                    setup_options[k2] = v
 
     setup_result = {}