Merge pull request #1725 from promisedlandt/s3_location_fix

Fix S3 directory location infinite loop

fog.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   ## the sub! line in the Rakefile
   s.name              = 'fog'
   s.version           = '1.10.0'
-  s.date              = '2013-03-05'
+  s.date              = '2013-03-30'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

lib/fog/aws/models/storage/directory.rb

@@ -43,7 +43,7 @@ module Fog
           if INVALID_LOCATIONS.include?(new_location)
             raise ArgumentError, "location must not include any of #{INVALID_LOCATIONS.join(', ')}. See http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html"
           else
-            merge_attributes(:location => new_location)
+            @location = new_location
           end
         end