Update from debian (Di 23. Apr 16:52:04 CEST 2013)
Merge branch 'master' of github.com:simonszu/dotfiles