[banshee/f16: 2/2] Merge branch 'master' into f16

[Dan Horák]

commit 8351444ef2385ca1e3ac43770ac5af539d9aff6b
Merge: 992017a 493aa88
Author: Dan Horák <dan at danny.cz>
Date:   Mon Dec 12 08:55:13 2011 +0100

    Merge branch 'master' into f16

 banshee.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---