diff --git a/lib/jdbc_adapter/jdbc_oracle.rb b/lib/jdbc_adapter/jdbc_oracle.rb
index 02da0de..bb2fed8 100644
--- a/lib/jdbc_adapter/jdbc_oracle.rb
+++ b/lib/jdbc_adapter/jdbc_oracle.rb
@@ -1,8 +1,5 @@

java.lang.LinkageError: duplicate class definition: InterfaceImpl1548
        at java.lang.ClassLoader.defineClass1(Native Method)
        at java.lang.ClassLoader.defineClass(ClassLoader.java:675)
        at org.jruby.util.JRubyClassLoader.defineClass(JRubyClassLoader.java:21)
        at org.jruby.java.MiniJava.defineOldStyleImplClass(MiniJava.java:485)

$ j gem install buildr --include-dependencies
INFO:  `gem install -y` is now default and will be removed
INFO:  use --ignore-dependencies to install only the gems you list
ERROR:  Error installing buildr:
        buildr requires hoe (= 1.3.0, runtime)

From 8edea623a4a497fe11a0df240c48f13980f831a8 Mon Sep 17 00:00:00 2001
From: Nick Sieger <nick@nicksieger.com>
Date: Mon, 14 Jul 2008 22:40:44 -0500
Subject: [PATCH] Add a more complicated block spec based on JRuby regression.

class Proxy
  def initialize(target)
    @target = target
  end
  private

$ rake test_sqlite3
(in /Users/nicksieger/Projects/ruby/rails/activerecord)
/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -Ilib:test:test/connections/native_sqlite3 "/Library/Ruby/Gems/1.8/gems/rake-0.8.1/lib/rake/rake_test_loader.rb" "test/cases/aaa_create_tables_test.rb" "test/cases/adapter_test.rb" "test/cases/aggregations_test.rb" "test/cases/ar_schema_test.rb" "test/cases/associations/belongs_to_associations_test.rb" "test/cases/associations/callbacks_test.rb" "test/cases/associations/cascaded_eager_loading_test.rb" "test/cases/associations/eager_load_nested_include_test.rb" "test/cases/associations/eager_singularization_test.rb" "test/cases/associations/eager_test.rb" "test/cases/associations/extension_test.rb" "test/cases/associations/has_and_belongs_to_many_associations_test.rb" "test/cases/associations/has_many_associations_test.rb" "test/cases/associations/has_many_through_associations_test.rb" "test/cases/associations/has_one_associations_test.rb" "test/cases/associations/has_one_through_associations_test.rb" "test/cases/associations/inner_join_association_test.rb" "test/cases/associations/join_model_test.rb" "test/cases/associations_test.rb" "test/cases/attribute_methods_test.rb" "test/cases/base_test.rb" "test/cases/binary_test.rb" "test/cases/calculations_test.rb" "test/cases/callbacks_observers_test.rb" "test/cases/callbacks_test.rb" "test/cases/class_inheritable_attributes_test.rb" "test/cases/column_alias_test.rb" "test/cases/column_definition_test.rb" "test/cases/copy_table_test_sqlite.rb" "test/cases/database_statements_test.rb" "test/cases/date_time_test.rb" "test/cases/defaults_test.rb" "test/cases/deprecated_finder_test.rb" "test/cases/dirty_test.rb" "test/cases/finder_respond_to_test.rb" "test/cases/finder_test.rb" "test/cases/fixtures_test.rb" "test/cases/inheritance_test.rb" "test/cases/invalid_date_test.rb" "test/cases/json_serialization_test.rb" "test/cases/lifecycle_test.rb" "test/cases/locking_test.rb" "test/cases/method_scoping_test.rb" "test/cases/migration_test.rb" "test/cases/mixin_test.rb" "test/cases/modules_test.rb" "test/cases/multiple_db_test.rb" "test/cases/named_scope_test.rb" "test/cases/pk_test.rb" "test/cases/query_cache_test.rb" "test/cases/readonly_test.rb" "test/cases/reflection_test.rb" "test/cases/schema_dumper_test.rb" "test/cases/serialization_test.rb" "test/cases/threaded_connections_test.rb" "test/cases/transactions_test.rb" "test/cases/unconnected_test.rb" "test/cases/validations_test.rb" "test/cases/xml_serialization_test.rb" 
Using native SQLite3
Loaded suite /Library/Ruby/Gems/1.8/gems/rake-0.8.1/lib/rake/rake_test_loader

diff --git a/src/org/jruby/RubyInstanceConfig.java b/src/org/jruby/RubyInstanceConfig.java
index 94b6307..3ac0786 100644
--- a/src/org/jruby/RubyInstanceConfig.java
+++ b/src/org/jruby/RubyInstanceConfig.java
@@ -950,13 +950,18 @@ public class RubyInstanceConfig {

$ git st
# On branch master
nothing to commit (working directory clean)
[12:31:20][~/Projects/jruby/trunk/jruby (master)]
$ git bisect reset

diff --git a/lib/image_voodoo.rb b/lib/image_voodoo.rb
index 79f8e6f..5b14ee6 100644
--- a/lib/image_voodoo.rb
+++ b/lib/image_voodoo.rb
@@ -303,8 +303,6 @@ class ImageVoodoo

$ java -version
java version "1.6.0_01"
Java(TM) SE Runtime Environment (build 1.6.0_01-b06)
Java HotSpot(TM) Server VM (build 1.6.0_01-b06, mixed mode)
$ java -d64 -version

Faults encountered running test/test_threaded_nonlocal_return, complete output follows: Error: test_threaded_nonlocal_return(TestThreadedNonlocalReturn): NoMethodError: undefined method `<<' for nil:NilClass     /export/home/nsieger/bamboo/home/xml-data/build-dir/JRUBY-TESTALL/./test/test_threaded_nonlocal_return.rb:16:in `test_threaded_nonlocal_return'     /export/home/nsieger/bamboo/home/xml-data/build-dir/JRUBY-TESTALL/./test/test_threaded_nonlocal_return.rb:16:in `times'     /export/home/nsieger/bamboo/home/xml-data/build-dir/JRUBY-TESTALL/./test/test_threaded_nonlocal_return.rb:16:in `test_threaded_nonlocal_return'     :1:in `initialize' 
junit.framework.AssertionFailedError: Faults encountered running test/test_threaded_nonlocal_return, complete output follows:
Error:
test_threaded_nonlocal_return(TestThreadedNonlocalReturn):
NoMethodError: undefined method `<<' for nil:NilClass

    def host_with_port_without_standard_port_handling
      if forwarded = env["HTTP_X_FORWARDED_HOST"]
        forwarded.split(/,\s?/).last
      elsif http_host = env['HTTP_HOST']
        http_host

## ~/.m2/settings.xml

<?xml version="1.0" encoding="UTF-8"?>
<settings>
  <servers>

diff --git a/src/org/jruby/RubyIO.java b/src/org/jruby/RubyIO.java
index 3dc27aa..4e6e4a0 100644
--- a/src/org/jruby/RubyIO.java
+++ b/src/org/jruby/RubyIO.java
@@ -900,18 +900,6 @@ public class RubyIO extends RubyObject {

diff --git a/src/org/jruby/util/ShellLauncher.java b/src/org/jruby/util/ShellLauncher.java
index 01c8ff1..9fb9f54 100644
--- a/src/org/jruby/util/ShellLauncher.java
+++ b/src/org/jruby/util/ShellLauncher.java
@@ -496,6 +496,9 @@ public class ShellLauncher {