Merge commit 'elmarco/bluetooth-fixes'
authorLennart Poettering <lennart@poettering.net>
Thu, 12 Mar 2009 19:25:48 +0000 (16:25 -0300)
committerLennart Poettering <lennart@poettering.net>
Thu, 12 Mar 2009 19:25:48 +0000 (16:25 -0300)

Trivial merge