lib/bundler.rb in bundler-1.0.19.rc vs lib/bundler.rb in bundler-1.0.20.rc

@@ -1,14 +1,15 @@
 require 'rbconfig'
 require 'fileutils'
 require 'pathname'
 
 begin
-  require 'psych'
+  # Pull in Psych if we can, but not if Syck is already loaded
+  require 'psych' unless defined?(YAML)
 rescue LoadError
+  require 'yaml'
 end
 
-require 'yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
 
 module Bundler