Merge branch '0.24.x' into merging

Conflicts:

	test/ral/type/filesources.rb

1 files changed, 8 insertions, 0 deletions

diff --git a/examples/one b/examples/one
new file mode 100644
index 000000000..452d32f3e
--- /dev/null
+++ b/examples/one
@@ -0,0 +1,8 @@
+# $Id$
+
+# this service doesn't actually exist, so we noop it
+# and this way, we can test noop :)
+service { "funtest":
+    running => "0",
+    noop => true
+}