From fd671a23aba26a511b2da1eb946122b3d9d043b0 Mon Sep 17 00:00:00 2001
From: Scott Davis <jetviper21@gmail.com>
Date: Tue, 8 Nov 2011 19:12:12 -0500
Subject: [PATCH] derp

---
 flowplayer.gemspec                | 2 +-
 lib/flowplayer.rb                 | 3 +++
 lib/flowplayer/railties/engine.rb | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/flowplayer.gemspec b/flowplayer.gemspec
index 306c83c..35cc185 100644
--- a/flowplayer.gemspec
+++ b/flowplayer.gemspec
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = %q{flowplayer}
-  s.version = '0.1.0'
+  s.version = '0.1.1'
   s.platform    = Gem::Platform::RUBY
 
   s.authors = ["Scott Davis"]
diff --git a/lib/flowplayer.rb b/lib/flowplayer.rb
index 671a79d..7c6c7a5 100644
--- a/lib/flowplayer.rb
+++ b/lib/flowplayer.rb
@@ -1,5 +1,8 @@
 require 'flowplayer/player'
 
 if defined?(Rails)
+  if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
+    require 'flowplayer/engine'
+  end
   require 'flowplayer/railtie'
 end
\ No newline at end of file
diff --git a/lib/flowplayer/railties/engine.rb b/lib/flowplayer/railties/engine.rb
index f6ebba0..99bfa87 100644
--- a/lib/flowplayer/railties/engine.rb
+++ b/lib/flowplayer/railties/engine.rb
@@ -3,4 +3,4 @@ module Flowplayer
     class Engine < ::Rails::Engine
     end
   end
-end
+end
\ No newline at end of file