[bluez/f16: 4/4] Merge remote-tracking branch 'origin/master' into f16

[Hans de Goede]

commit 23c6f9dfe93efcde8414d53cb4a085e754c7f798
Merge: bb087d5 11e8b30
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Aug 29 15:41:15 2011 +0200

    Merge remote-tracking branch 'origin/master' into f16

 bluez.spec |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---