Discovered clocks were not matching up with active clock

lisp/ChangeLog

@@ -11,6 +11,8 @@
 	(org-clock-resolve): Added new commands g/G and j/J, and a
 	help window describing all commands and their meaning.
 	(org-clock-resolve-expert): New customization variable.
+	(org-find-open-clocks): Fixed a bug that caused discovered
+	clocks not to match up with the currently active clock.
 
 2010-05-15  Carsten Dominik  <carsten.dominik@gmail.com>
 

lisp/org-clock.el

@@ -592,7 +592,7 @@ Use alsa's aplay tool if available."
       (save-excursion
 	(goto-char (point-min))
 	(while (re-search-forward "CLOCK: \\(\\[.*?\\]\\)$" nil t)
-	  (push (cons (copy-marker (1- (match-end 1)) t)
+	  (push (cons (copy-marker (match-end 1) t)
 		      (org-time-string-to-time (match-string 1))) clocks))))
     clocks))
 
@@ -1296,7 +1296,7 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
 	  (org-clock-delete-current))))))
 
 (defun org-clock-cancel ()
-  "Cancel the running clock be removing the start timestamp."
+  "Cancel the running clock by removing the start timestamp."
   (interactive)
   (when (not (org-clocking-p))
     (setq global-mode-string