Merge commit 'elmarco/bluetooth-fixes'

author Lennart Poettering <lennart@poettering.net>

Thu, 19 Mar 2009 16:46:13 +0000 (17:46 +0100)

committer Lennart Poettering <lennart@poettering.net>

Thu, 19 Mar 2009 16:46:13 +0000 (17:46 +0100)
author Lennart Poettering <lennart@poettering.net>
Thu, 19 Mar 2009 16:46:13 +0000 (17:46 +0100)
committer Lennart Poettering <lennart@poettering.net>
Thu, 19 Mar 2009 16:46:13 +0000 (17:46 +0100)
diff --cc src/modules/bluetooth/module-bluetooth-device.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 19 Mar 2009 16:46:13 +0000 (17:46 +0100)
committer	Lennart Poettering <lennart@poettering.net>
	Thu, 19 Mar 2009 16:46:13 +0000 (17:46 +0100)