Merge branch 'patch-1'
Merge branch 'master' of https://github.com/cooljeanius/fink