Merge branch 'master' into my_head

Conflicts:
	merb-action-args/lib/merb-action-args/version.rb
	merb-core/Gemfile
	merb-core/merb-core.gemspec
	merb-exceptions/lib/merb-exceptions/version.rb
	merb-haml/lib/merb-haml/version.rb
	merb-mailer/lib/merb-mailer/version.rb