Merge branch '0.24.x' into merging

Conflicts:

	test/ral/type/filesources.rb

1 files changed, 13 insertions, 0 deletions

diff --git a/examples/allatonce b/examples/allatonce
new file mode 100644
index 000000000..8912ec4e7
--- /dev/null
+++ b/examples/allatonce
@@ -0,0 +1,13 @@
+# $Id$
+
+define thingie {
+    file { "/tmp/classtest": ensure => file, mode => 755 }
+    #testing {}
+}
+
+class testing {
+    thingie { "componentname": }
+}
+
+#component {}
+testing { "testingname": }