Merge commit 'elmarco/bluetooth-fixes'
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Mar 2009 11:26:09 +0000 (12:26 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 5 Mar 2009 11:26:09 +0000 (12:26 +0100)

Trivial merge