From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Ken Brown <kbrown@cornell.edu>
Newsgroups: gmane.emacs.devel
Subject: Incorrect merge
Date: Mon, 01 Nov 2010 09:48:22 -0400
Message-ID: <4CCEC526.3070502@cornell.edu>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Trace: dough.gmane.org 1288619328 17774 80.91.229.12 (1 Nov 2010 13:48:48 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Mon, 1 Nov 2010 13:48:48 +0000 (UTC)
Cc: Emacs <emacs-devel@gnu.org>
To: Michael Albinus <michael.albinus@gmx.de>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 01 14:48:41 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1PCukZ-0007zS-C8
	for ged-emacs-devel@m.gmane.org; Mon, 01 Nov 2010 14:48:40 +0100
Original-Received: from localhost ([127.0.0.1]:45951 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PCukX-0002cq-6a
	for ged-emacs-devel@m.gmane.org; Mon, 01 Nov 2010 09:48:37 -0400
Original-Received: from [140.186.70.92] (port=33519 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PCukN-0002a1-0R
	for emacs-devel@gnu.org; Mon, 01 Nov 2010 09:48:30 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kbrown@cornell.edu>) id 1PCukG-0003cy-CP
	for emacs-devel@gnu.org; Mon, 01 Nov 2010 09:48:21 -0400
Original-Received: from granite1.mail.cornell.edu ([128.253.83.141]:63315
	helo=authusersmtp.mail.cornell.edu)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kbrown@cornell.edu>) id 1PCukG-0003cp-3E
	for emacs-devel@gnu.org; Mon, 01 Nov 2010 09:48:20 -0400
Original-Received: from [128.84.234.191] (markov.math.cornell.edu [128.84.234.191])
	(authenticated bits=0)
	by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id
	oA1DmH3p026383
	(version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
	Mon, 1 Nov 2010 09:48:17 -0400 (EDT)
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.9.2.11) Gecko/20101013 Thunderbird/3.1.5
X-detected-operating-system: by eggs.gnu.org: Solaris 9
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:132234
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/132234>

Hi Michael,

It looks like the following change got merged with the trunk inadvertently:

revno: 100136
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: emacs-23
timestamp: Mon 2010-10-25 13:46:21 +0200
message:
   * dbusbind.c (Fdbus_call_method_asynchronously)
   (Fdbus_register_signal, Fdbus_register_method): Check, whether
   `dbus-registered-objects-table' is initialized.

   Must not be synchronized with the trunk.

Ken