Update from nb10003429 (Fr 8. Feb 14:45:18 CET 2013)
Merge branch 'master' of github.com:simonszu/dotfiles