Merge branch 'linuxbrew' of https://github.com/LeonB/linuxbrew

Conflicts:
	Library/Homebrew/requirements/x11_dependency.rb