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

lisp/ChangeLog

@@ -1,3 +1,7 @@
+2010-04-04  Bastien Guerry  <bzg@altern.org>
+
+	* org.el (org-splice-latex-header): Fix typo.
+
 2010-04-04  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-make-header): Use

lisp/org.el

@@ -15313,7 +15313,7 @@ at the end.  If EXTRA is a string, it is also appended."
     (if (string-match "\\[PACKAGES\\]" template)
 	(setq template (replace-match (or packages "") t t template))
       (setq template (concat template "\n" packages)))
-    (if (and extra (sring-match "\\S-" extra))
+    (if (and extra (string-match "\\S-" extra))
 	(concat template "\n" extra)
       template)))