Merge remote-tracking branch 'sarava/master'

Conflicts:
	manifests/defines/line.pp
	manifests/defines/module_dir.pp
	manifests/defines/module_file.pp
	manifests/init.pp

diff --cc manifests/defines/line.pp
index ccfa357,44c52a0..bbe0a54
--- 1/manifests/defines/line.pp
--- 2/manifests/defines/line.pp
+++ b/manifests/defines/line.pp
@@@ -34,6 -33,9 +33,10 @@@
  #             notify => Service[munin-node],
  #             require => Package[munin-node];
  #  }
+ #
+ # Code with fixes gathered at
+ # http://reductivelabs.com/trac/puppet/wiki/Recipes/SimpleText
++>>>>>>> sarava/master
  define line($file, $line, $ensure = 'present') {
    case $ensure {
      default : { err ( "unknown ensure value '${ensure}'" ) }

diff --cc manifests/defines/module_file.pp
Simple merge