[O] Bug: "File mode specification error: (invalid-function org-check-version)" on startup

[Steinar Bang]

Platform: Windows 2008R2 SP1
          GNU Emacs 23.4.1 (i386-mingw-nt6.1.7601) of 2012-02-04 on MARVIN

I pulled org-mode master from git today.  When I tried to open an org
file, it failed, with the following message in the minibuffer:
 File mode specification error: (invalid-function org-check-version)

My previous version (ORIG_HEAD), was:
 cf8d979d8c519ab62a02bc7501baa376b122bf3d

The HEAD after update, was:
 7791d40045ea8b6eef089c362fdf3cb35312a1a8

git bisect identified the the following commit as the culprit:
C:\Users\sb\Documents\git\org-mode>git bisect bad
abbea596111611a945d73783b3e8790e76599740 is the first bad commit
commit abbea596111611a945d73783b3e8790e76599740
Author: Bastien Guerry <address@hidden>
Date:   Sat Jul 28 00:55:45 2012 +0200

    Move org-element.el from contrib/lisp to lisp/.

    * org.el (org-mode-map): Add keybindings to
    `org-element-transpose' and `org-narrow-to-element'.
    (org-metaup): Fall back on `org-element-drag-backward'.
    (org-metadown): Fall back on `org-element-drag-forward'.
    Also move chunks of declarations and require statements to
    get rid of compiler warnings.

    * org-exp-blocks.el (org): Don't require org.  Add declarations.

    * org-clock.el (org): Don't require org.

    * ob-exp.el (org-list-forbidden-blocks): Add declarations.

:040000 040000 6669cee7aab025b4761b8a9e54da5cba675b48fc 
3de0787e877cda3d280fa85c61cd945cb305c122 M      contrib
:040000 040000 8a83fd0e0338ed15b5f9c97c846c485f8447b13d 
169d363447239443ff0be48910fb07cf726bd0c9 M      lisp