From 70e6c8ccb45c2f2d9deccda9ff5f33e23d0488b6 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Sun, 31 Jul 2011 21:42:25 -0700
Subject: [PATCH] update gemfile.lock due to adding guard

---
 Gemfile.lock | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b9c28f513..6b040407e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -110,7 +110,7 @@ GEM
       xml-simple
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    bunny (0.6.0)
+    bunny (0.7.4)
     capistrano (2.5.19)
       highline
       net-scp (>= 1.0.0)
@@ -143,15 +143,14 @@ GEM
       ohai (>= 0.5.7)
       rest-client (< 1.7.0, >= 1.0.4)
       uuidtools
-    childprocess (0.1.9)
+    childprocess (0.2.0)
       ffi (~> 1.0.6)
     closure-compiler (1.1.1)
     cloudfiles (1.4.10)
       mime-types (>= 1.16)
     columnize (0.3.4)
-    configuration (1.3.1)
     crack (0.1.8)
-    cucumber (1.0.1)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.4.5)
@@ -175,9 +174,9 @@ GEM
     eventmachine (0.12.10)
     excon (0.2.4)
     extlib (0.9.15)
-    factory_girl (1.3.3)
-    factory_girl_rails (1.0.1)
-      factory_girl (~> 1.3)
+    factory_girl (2.0.2)
+    factory_girl_rails (1.1.0)
+      factory_girl (~> 2.0.0)
       railties (>= 3.0.0)
     faraday (0.6.1)
       addressable (~> 2.2.4)
@@ -201,7 +200,7 @@ GEM
       nokogiri (~> 1.4.3.1)
       ruby-hmac
     foreigner (0.9.1)
-    formatador (0.1.5)
+    formatador (0.2.0)
     fuubar (0.0.5)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
@@ -234,9 +233,7 @@ GEM
       selenium-webdriver (>= 0.1.3)
     json (1.4.6)
     json_pure (1.5.3)
-    launchy (0.4.0)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
+    launchy (2.0.3)
     linecache (0.43)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -261,7 +258,7 @@ GEM
       gem_plugin (>= 0.2.3)
     multi_json (1.0.3)
     multi_xml (0.2.2)
-    multipart-post (1.1.2)
+    multipart-post (1.1.3)
     mysql2 (0.2.6)
     net-ldap (0.2.2)
     net-scp (1.0.4)
@@ -271,7 +268,7 @@ GEM
     net-ssh (2.0.24)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    newrelic_rpm (3.1.0)
+    newrelic_rpm (3.1.1)
     nokogiri (1.4.3.1)
     oa-basic (0.2.6)
       oa-core (= 0.2.6)
@@ -322,7 +319,7 @@ GEM
       oa-openid (= 0.2.6)
     open4 (1.1.0)
     orm_adapter (0.0.5)
-    polyglot (0.3.1)
+    polyglot (0.3.2)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.2.3)
     rack-mount (0.6.14)
@@ -351,9 +348,9 @@ GEM
     rake (0.9.2)
     rash (0.3.0)
       hashie (~> 1.0.0)
-    rb-fsevent (0.4.1)
+    rb-fsevent (0.4.2)
     rcov (0.9.9)
-    rdoc (3.8)
+    rdoc (3.9.1)
     redis (2.2.1)
     redis-namespace (0.8.0)
       redis (< 3.0.0)
@@ -414,17 +411,18 @@ GEM
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
     subexec (0.0.4)
     systemu (2.2.0)
-    term-ansicolor (1.0.5)
+    term-ansicolor (1.0.6)
     thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.2)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     twitter (1.5.0)
       faraday (~> 0.6.1)
@@ -441,7 +439,7 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.8)
       rack (>= 1.0.0)
-    warden (1.0.4)
+    warden (1.0.5)
       rack (>= 1.0)
     webmock (1.6.2)
       addressable (>= 2.2.2)