Merge branch 'master' of https://github.com/mxcl/homebrew

Conflicts:
	.gitignore
Merge branch 'master' into konquis-version

* master:
  added cli tool for ICY streams