Update from meldir (Sa 9. Feb 11:08:03 CET 2013)
Merge branch 'master' of github.com:simonszu/dotfiles