Merge branch '0.24.x' into merging

Conflicts:

	test/ral/type/filesources.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/examples/simpletests b/examples/simpletests
new file mode 100644
index 000000000..b4fd3234e
--- /dev/null
+++ b/examples/simpletests
@@ -0,0 +1,11 @@
+# $Id$
+
+file {
+    "/tmp/atest": ensure => file;
+    "/tmp/btest": ensure => file
+}
+
+file {
+    "/tmp/ctest": ensure => file;
+    "/tmp/dtest": ensure => file;
+}