Merge branch '3.x' into 4.x

lib/puppet/parser/functions/str2bool.rb

@@ -15,6 +15,11 @@ like: 0, f, n, false, no to 'false'.
 
     string = arguments[0]
     
+    # If string is already Boolean, return it
+    if !!string == string
+      return string
+    end
+
     unless string.is_a?(String)
       raise(Puppet::ParseError, 'str2bool(): Requires either ' +
         'string to work with')

spec/unit/puppet/parser/functions/str2bool_spec.rb

@@ -21,4 +21,11 @@ describe "the str2bool function" do
     result = scope.function_str2bool(["undef"])
     result.should(eq(false))
   end
+  
+  it "should return the boolean it was called with" do
+    result = scope.function_str2bool([true])
+    result.should(eq(true))
+    result = scope.function_str2bool([false])
+    result.should(eq(false))
+  end
 end