Rakefile in chef-server-webui-0.9.0 vs Rakefile in chef-server-webui-0.9.2

@@ -1,12 +1,16 @@
 require File.dirname(__FILE__) + '/lib/chef-server-webui/version'
 
 require 'rubygems'
 require 'rake/gempackagetask'
 
-require 'merb-core'
-require 'merb-core/tasks/merb'
+begin
+  require 'merb-core'
+  require 'merb-core/tasks/merb'
+rescue LoadError
+  STDERR.puts "merb is not installed, merb rake tasks will not be available."
+end
 
 GEM_NAME = "chef-server-webui"
 AUTHOR = "Opscode"
 EMAIL = "[e-mail]"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
@@ -22,15 +26,15 @@
   s.description = s.summary
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  s.add_dependency "merb-core", "~> 1.0"
-  s.add_dependency "merb-slices", "~> 1.0"
-  s.add_dependency "merb-assets", "~> 1.0"
-  s.add_dependency "merb-helpers", "~> 1.0"
-  s.add_dependency "merb-haml", "~> 1.0"
-  s.add_dependency "merb-param-protection", "~> 1.0"
+  s.add_dependency "merb-core", "~> 1.1.0"
+  s.add_dependency "merb-slices", "~> 1.1.0"
+  s.add_dependency "merb-assets", "~> 1.1.0"
+  s.add_dependency "merb-helpers", "~> 1.1.0"
+  s.add_dependency "merb-haml", "~> 1.1.0"
+  s.add_dependency "merb-param-protection", "~> 1.1.0"
 
   s.add_dependency "json", "<= 1.4.2"
 
   %w{thin haml ruby-openid coderay}.each { |g| s.add_dependency g}