Add Gemfile with debian squeeze versions
Require rubygems for daemons scripts
Silence deprecation warnings
Merge branch 'master' of git://gitorious.org/noosfero/noosfero into easysafeinstall

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'noosfero/stable' into easysafeinstall
Merge tag '0.42.0' into easysafeinstall

Conflicts:
	config/environment.rb
Merge branch 'stable' of git://gitorious.org/noosfero/noosfero into easysafeinstall

Conflicts:
	Rakefile
Fix rubyzip version
Use mime-types for ruby 1.8
Add correct version of locale
Merge branch 'easysafeinstall' of git://github.com/coletivoEITA/noosfero-ecosol

Conflicts:
	Gemfile
	config/environment.rb