Work with abbrev tables only if abbrev.el is loaded

lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-10-29  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el ("abbrev"): Work with abbrev tables only after they have
+	been loaded.
+
 	* org-list.el (org-list-send-list): Fix bug related to match
 	data.
 

lisp/org.el

@@ -4141,8 +4141,9 @@ The following commands are available:
       (org-indent-mode 1))
     (org-set-startup-visibility)))
 
-(abbrev-table-put org-mode-abbrev-table
-                  :parents (list text-mode-abbrev-table))
+(eval-after-load "abbrev"
+  '(abbrev-table-put org-mode-abbrev-table
+		     :parents (list text-mode-abbrev-table)))
 
 (put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify)