Merge commit 'vudentz/master'

author Lennart Poettering <lennart@poettering.net>

Mon, 13 Oct 2008 17:55:11 +0000 (19:55 +0200)

committer Lennart Poettering <lennart@poettering.net>

Mon, 13 Oct 2008 17:55:11 +0000 (19:55 +0200)
author Lennart Poettering <lennart@poettering.net>
Mon, 13 Oct 2008 17:55:11 +0000 (19:55 +0200)
committer Lennart Poettering <lennart@poettering.net>
Mon, 13 Oct 2008 17:55:11 +0000 (19:55 +0200)
diff --cc src/modules/bluetooth/module-bluetooth-discover.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 13 Oct 2008 17:55:11 +0000 (19:55 +0200)
committer	Lennart Poettering <lennart@poettering.net>
	Mon, 13 Oct 2008 17:55:11 +0000 (19:55 +0200)