use @ global variable in erb
Merge pull request #49 from maxamg/master

use @ global variable in erb
Preserve FQDN parameter
Revert "fix run_user and run_group"

This reverts commit 4efaf7576dafb701a67052b41b7fa87935dd6db5.
Revert "add initial gentoo support"

This reverts commit 83c2890c40962cd19b5a402b250a40029f46430b.

Conflicts:
	manifests/config.pp
Add gentoo back
Add back rsyslog::rsyslog_default_file
Use operatingsystem for gentoo
Merge pull request #51 from Aethylred/preserve_fqdn

Preserve FQDN parameter
Merge pull request #54 from raphink/dev/revert_run_user

Revert run_user change
Merge branch 'master' of https://github.com/saz/puppet-rsyslog into el5

Conflicts:
	templates/rsyslog.conf.erb