From 7a183754b73ff7a88c0414ac1852322cbc68b059 Mon Sep 17 00:00:00 2001
From: Scott Davis <jetviper21@gmail.com>
Date: Mon, 25 Jul 2011 23:05:37 -0400
Subject: [PATCH] merge 454 closes 454

---
 Gemfile.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5b86ed71..c36c84da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    compass (0.11.3.rails.0.2124003)
+    compass (0.12.0.alpha.0.38cf0e5)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
@@ -105,7 +105,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.8.7)
     rb-fsevent (0.4.0)
     rcov (0.9.9)
     rdoc (3.6.1)
@@ -147,6 +147,7 @@ DEPENDENCIES
   livereload
   mocha
   rails (~> 3.0.0.rc)
+  rake (= 0.8.7)
   rb-fsevent
   rcov
   rspec (~> 2.0.0)