[blueman/f16: 6/6] Merge branch 'master' into f16

[Christoph Wickert]

commit 4a20586c3a7bd62cfa4841062169add99d612d14
Merge: 69494c9 032d298
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun May 6 14:18:40 2012 +0200

    Merge branch 'master' into f16

 blueman.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---