trying to build on Mavericks
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew

Conflicts:
	Library/Formula/ruby-build.rb
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew
Merge branch 'master' of https://github.com/Homebrew/homebrew