ca5dce3
Further Ruby 1.9 changes. (cherry picked from commit ad3314d715db6c6e446eabe26d9defa2c10cb0d5)