Subject: Re: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org.

From: Chong Yidong <[email-masked]>
Date: Wed, 24 Oct 2012 14:17:11 -0400

>>   * lisp/org/org-lparse.el: Move some hooks from org-lparse to
>>   org-do-lparse.
>
> I pushed another fix in Org's git repo here:
>
>   http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=c33909
>
> Can you revert this change?  Otherwise it will create a merge
> conflict.  If you think the issue is really important, I can
> fix it in Emacs trunk, using the same fix I made in Org.

OK, reverted.  Please go ahead and commit your other fix.