Release 6.36crelease_6.36c

57 files changed, 60 insertions, 58 deletions

diff --git a/README_DIST b/README_DIST
index 22392e34a..8b7b933fa 100644
--- a/README_DIST
+++ b/README_DIST
@@ -1,7 +1,7 @@
 The is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-The version of this release is: 6.36
+The version of this release is: 6.36c
 
 The homepage of Org is at http://orgmode.org
 
diff --git a/doc/org.texi b/doc/org.texi
index 539db0c19..ef9b4008e 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.36
+@set VERSION 6.36c
 @set DATE May 2010
 
 @c Version and Contact Info
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index b917c968a..ab4800265 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.36}
+\def\orgversionnumber{6.36c}
 \def\versionyear{2010}          % latest update
 \def\year{2010}                 % latest copyright year
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 50c9d79a5..0e1cb47cb 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index e3ebab0f2..48587d059 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el
index cf01e45ca..3682a455d 100644
--- a/lisp/org-ascii.el
+++ b/lisp/org-ascii.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 6a3c0853e..971e85ce8 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -4,7 +4,7 @@
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
-;; Version: 6.36
+;; Version: 6.36c
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index f3417c4d0..4ea221e66 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -7,7 +7,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-beamer.el b/lisp/org-beamer.el
index 95775635a..6b01486fb 100644
--- a/lisp/org-beamer.el
+++ b/lisp/org-beamer.el
@@ -2,7 +2,7 @@
 ;;
 ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ;;
-;; Version: 6.36
+;; Version: 6.36c
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el
index 40d6c736f..22139c9d4 100644
--- a/lisp/org-bibtex.el
+++ b/lisp/org-bibtex.el
@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 0facc0a39..ad016fe5e 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 475192938..21fdbc762 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 311737b9a..20b2953a3 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 929ff794e..8f39c0006 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index 92e3c5c0d..649469dcf 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -4,7 +4,7 @@
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el
-;; Version: 6.36
+;; Version: 6.36c
 ;; Keywords: org-mode
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: Peter Jones <pjones@pmade.com>
diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el
index a63c0ff04..b89323208 100644
--- a/lisp/org-ctags.el
+++ b/lisp/org-ctags.el
@@ -6,7 +6,7 @@
 ;;; Version: 1.0
 
 ;; Keywords: org, wp
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index c3935bc34..3cb9d1bb6 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index 1eb66ab70..a83b83c52 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-docbook.el
-;; Version: 6.36
+;; Version: 6.36c
 ;; Author: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Keywords: org, wp, docbook
diff --git a/lisp/org-docview.el b/lisp/org-docview.el
index 92c5f0b44..441aa1e29 100644
--- a/lisp/org-docview.el
+++ b/lisp/org-docview.el
@@ -6,7 +6,7 @@
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 1b6928463..1e20450ca 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -6,7 +6,7 @@
 ;;         Ulf Stegemann <ulf at zeitform dot de>
 ;; Keywords: outlines, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el
index 8f1b9327d..4742a3b78 100644
--- a/lisp/org-exp-blocks.el
+++ b/lisp/org-exp-blocks.el
@@ -4,7 +4,7 @@
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
-;; Version: 6.36
+;; Version: 6.36c
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 710c420c0..160dcb46c 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index d2581aaba..b6d3b6a3f 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-feed.el b/lisp/org-feed.el
index 446ae38be..3d56474c9 100644
--- a/lisp/org-feed.el
+++ b/lisp/org-feed.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 664cbdbf8..079bf7827 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index af816dc90..d98a7f095 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -5,7 +5,7 @@
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index c1343f118..dfd01cd36 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -7,7 +7,7 @@
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index 538f2e932..f5d569fa6 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -5,7 +5,7 @@
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-html.el b/lisp/org-html.el
index f29084387..199b7ab90 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el
index 5bce93c64..41ba47e49 100644
--- a/lisp/org-icalendar.el
+++ b/lisp/org-icalendar.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-id.el b/lisp/org-id.el
index b17436429..cef75a9fe 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index 2d2d6ebfa..de8595485 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -4,7 +4,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-info.el b/lisp/org-info.el
index eba0add0c..4e9090838 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index 43b873e0a..0a11569a5 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index 62fe1e77c..17cf3534a 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index 3c13a0c69..f0f3613b0 100644
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 5e51a6a4a..db26fb4b8 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-latex.el
-;; Version: 6.36
+;; Version: 6.36c
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 0537d82bf..4b6ebec04 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -7,7 +7,7 @@
 ;;	   Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'cl))
 (require 'org-macs)
 (require 'org-compat)
 
diff --git a/lisp/org-mac-message.el b/lisp/org-mac-message.el
index 268a41cc3..d7eca8806 100644
--- a/lisp/org-mac-message.el
+++ b/lisp/org-mac-message.el
@@ -5,7 +5,7 @@
 ;; Author: John Wiegley <johnw@gnu.org>
 ;;         Christopher Suckling <suckling at gmail dot com>
 
-;; Version: 6.36
+;; Version: 6.36c
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 2308fbec3..dbd1568de 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mew.el b/lisp/org-mew.el
index 9f348e559..a41b21a7f 100644
--- a/lisp/org-mew.el
+++ b/lisp/org-mew.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index 51f927a32..4ea3324b2 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -6,7 +6,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 86d8a8532..a1c20e111 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -4,7 +4,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index f927cfd4a..66d6aa821 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 9791df793..ea0333f1f 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 0dfbaf95a..ab886d0f9 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -9,7 +9,7 @@
 ;; Author: Ross Patterson <me AT rpatterson DOT net>
 ;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
 ;; Keywords: org, emacsclient, wp
-;; Version: 6.36
+;; Version: 6.36c
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index 6fc5436e9..3e77fe22d 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -5,7 +5,7 @@
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
 ;; Keywords: hypermedia, outlines, wp
-;; Version: 6.36
+;; Version: 6.36c
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index e4401893f..c4da8f6fb 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el
index 36bc9911b..0d3c3818f 100644
--- a/lisp/org-rmail.el
+++ b/lisp/org-rmail.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 541944e1a..592364d49 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -8,7 +8,7 @@
 ;;         Dan Davison <davison at stats dot ox dot ac dot uk>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 4a41b7367..addc740b4 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 05a1beb07..ca8154300 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-vm.el b/lisp/org-vm.el
index 953570891..99a98aa64 100644
--- a/lisp/org-vm.el
+++ b/lisp/org-vm.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el
index 9af31f615..ad08decd7 100644
--- a/lisp/org-w3m.el
+++ b/lisp/org-w3m.el
@@ -5,7 +5,7 @@
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-wl.el b/lisp/org-wl.el
index 439dc34ab..5141d981a 100644
--- a/lisp/org-wl.el
+++ b/lisp/org-wl.el
@@ -7,7 +7,7 @@
 ;;         David Maus <dmaus at ictsoc dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org-xoxo.el b/lisp/org-xoxo.el
index 724103ac3..266e01d6a 100644
--- a/lisp/org-xoxo.el
+++ b/lisp/org-xoxo.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org.el b/lisp/org.el
index d3dbbf161..c041db121 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.36
+;; Version: 6.36c
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -108,7 +108,7 @@
 
 ;;; Version
 
-(defconst org-version "6.36"
+(defconst org-version "6.36c"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)