Fix comment syntax in org-mode

Patch by Leo.

If this works, we have fixed an issue that has bugged me for several
years.

lisp/ChangeLog

@@ -1,5 +1,7 @@
 2010-05-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-mode): Fix comment syntax settings.
+
 	* org-src.el (org-edit-src-allow-write-back-p): Define
 	variable.
 

lisp/org.el

@@ -4421,7 +4421,6 @@ The following commands are available:
     (org-set-tag-faces 'org-tag-faces org-tag-faces))
   ;; Calc embedded
   (org-set-local 'calc-embedded-open-mode "# ")
-  (modify-syntax-entry ?# "<")
   (modify-syntax-entry ?@ "w")
   (if org-startup-truncated (setq truncate-lines t))
   (org-set-local 'font-lock-unfontify-region-function
@@ -4450,8 +4449,10 @@ The following commands are available:
 		 'org-block-todo-from-checkboxes))
 
   ;; Comment characters
-;  (org-set-local 'comment-start "#") ;; FIXME: this breaks wrapping
+  (org-set-local 'comment-start "#")
   (org-set-local 'comment-padding " ")
+  (modify-syntax-entry ?# "<")
+  (modify-syntax-entry ?\n ">")
 
   ;; Align options lines
   (org-set-local