Merge branch '0.24.x' into merging

Conflicts:

	test/ral/type/filesources.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/examples/assignments b/examples/assignments
new file mode 100644
index 000000000..3edcef84e
--- /dev/null
+++ b/examples/assignments
@@ -0,0 +1,11 @@
+# $Id$
+
+$goodness = sunos
+
+$subvariable = $goodness
+
+$yayness = "this is a string of text"
+
+#$sleeper = service { sleeper:
+#    running => "1"
+#}