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

lisp/ChangeLog

@@ -1,3 +1,8 @@
+2010-04-09  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-mobile.el (org-mobile-check-setup): Make sure that there is
+	a binary to compute checksums.
+
 2010-04-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-insert-link): Find the link buffer on visible

lisp/org-mobile.el

@@ -349,6 +349,9 @@ agenda view showing the flagged items."
 		(file-name-directory org-mobile-inbox-for-pull)))
     (error
      "Variable `org-mobile-inbox-for-pull' must point to a file in an existing directory"))
+  (unless (and org-mobile-checksum-binary
+	       (string-match "\\S-" org-mobile-checksum-binary))
+    (error "No executable found to compute checksums"))
   (when org-mobile-use-encryption
     (unless (string-match "\\S-" org-mobile-encryption-password)
       (error