Merge commit 'elmarco/bluetooth-fixes'

author Lennart Poettering <lennart@poettering.net>

Mon, 30 Mar 2009 18:34:49 +0000 (20:34 +0200)

committer Lennart Poettering <lennart@poettering.net>

Mon, 30 Mar 2009 18:34:49 +0000 (20:34 +0200)
author Lennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 18:34:49 +0000 (20:34 +0200)
committer Lennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 18:34:49 +0000 (20:34 +0200)
diff --cc src/modules/bluetooth/bluetooth-util.c
Simple merge
diff --cc src/modules/bluetooth/module-bluetooth-device.c
Simple merge
diff --cc src/modules/bluetooth/module-bluetooth-discover.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 30 Mar 2009 18:34:49 +0000 (20:34 +0200)
committer	Lennart Poettering <lennart@poettering.net>
	Mon, 30 Mar 2009 18:34:49 +0000 (20:34 +0200)
		1	2
src/modules/bluetooth/bluetooth-util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/bluetooth/module-bluetooth-device.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/bluetooth/module-bluetooth-discover.c	patch \|	diff1 \|	diff2 \|	blob \| history