Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone

author Marcel Holtmann <marcel@holtmann.org>

Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)

committer Marcel Holtmann <marcel@holtmann.org>

Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)
author Marcel Holtmann <marcel@holtmann.org>
Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)
committer Marcel Holtmann <marcel@holtmann.org>
Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)
diff --cc src/adapter.c
Simple merge
diff --cc src/main.c
Simple merge
author	Marcel Holtmann <marcel@holtmann.org>
	Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)
committer	Marcel Holtmann <marcel@holtmann.org>
	Tue, 2 Sep 2008 00:28:33 +0000 (02:28 +0200)
		1	2
src/adapter.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history