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

lisp/ChangeLog

@@ -1,5 +1,8 @@
 2010-04-23  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-entities.el (org-entities): Use \land and \lor for logical
+	operators.
+
 	* org.el (org-shiftmetaleft, org-shiftmetaright): Call the subtree
 	indentation commands.
 	(org-hidden-tree-error): New defsubst.

lisp/org-entities.el

@@ -293,9 +293,9 @@ loaded, add these packages to `org-export-latex-packages-alist'."
     ("infty" "\\infty" t "∞" "[infinity]" "[infinity]" "∞")
     ("ang" "\\angle" t "∠" "[angle]" "[angle]" "∠")
     ("angle" "\\angle" t "∠" "[angle]" "[angle]" "∠")
-    ("and" "\\wedge" t "∧" "[logical and]" "[logical and]" "∧")
+    ("land" "\\land" t "∧" "[logical and]" "[logical and]" "∧")
     ("wedge" "\\wedge" t "∧" "[logical and]" "[logical and]" "∧")
-    ("or" "\\vee" t "∨" "[logical or]" "[logical or]" "∨")
+    ("lor" "\\lor" t "∨" "[logical or]" "[logical or]" "∨")
     ("vee" "\\vee" t "∨" "[logical or]" "[logical or]" "∨")
     ("cap" "\\cap" t "∩" "[intersection]" "[intersection]" "∩")
     ("cup" "\\cup" t "∪" "[union]" "[union]" "∪")