Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:

	lisp/org.el

lisp/ChangeLog

@@ -1,3 +1,8 @@
+2008-07-20  Juri Linkov <juri@jurta.org>
+
+	* org.el (narrow-map): Bind `org-narrow-to-subtree' to "s" on the
+	new keymap `narrow-map' instead of binding "\C-xns".
+
 2008-07-18  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-open-file): Use