Merge branch 'master' of git://labs.riseup.net/shared-sshd

Conflicts:
	templates/sshd_config/Debian_squeeze.erb

diff --cc manifests/client/base.pp
Simple merge

diff --cc manifests/init.pp
Simple merge

diff --cc templates/sshd_config/Debian_etch.erb
Simple merge

diff --cc templates/sshd_config/Debian_lenny.erb
Simple merge

diff --cc templates/sshd_config/Debian_squeeze.erb
Simple merge