Merge branch 'master' into turanga

* master:
  added /media to cdpath

zshrc

@@ -100,7 +100,7 @@ function format-xml() {
 	rm -f $T
 }
 
-cdpath=('.' '..' '~' /var/run/media/$USER)
+cdpath=('.' '..' '~' '/media' /var/run/media/$USER)
 zstyle ':completion:*:complete:(cd|pushd):*' tag-order \
 	'local-directories named-directories path-directories'
 zstyle ':completion:*' group-name ''