Merged 14009:14059 from trunk.

diff --cc config/environment.rb
index b3481c024434dcaba4fc36584e7e0aca0e7b5666,e6af619eb82b03aaaf8400db39ea951dbba227b6..ce1216b83c6966a0c653b69f607b0fb563eb2855
--- 1/config/environment.rb
--- 2/config/environment.rb
+++ b/config/environment.rb
@@@ -40,16 -37,6 +40,16 @@@ Rails::Initializer.run do |config
      config.frameworks -= [ :active_record ]
    end
  
-   config.gem 'libxml-ruby', :version => '>= 1.0.0', :lib => 'libxml'
 +  # Specify gems that this application depends on. 
 +  # They can then be installed with "rake gems:install" on new installations.
 +  # config.gem "bj"
 +  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
 +  # config.gem "aws-s3", :lib => "aws/s3"
 +  config.gem 'composite_primary_keys', :version => '1.1.0'
++  config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
 +  config.gem 'rmagick', :lib => 'RMagick'
 +  config.gem 'mysql'
 +
    # Only load the plugins named here, in the order given. By default, all plugins 
    # in vendor/plugins are loaded in alphabetical order.
    # :all can be used as a placeholder for all plugins not explicitly named