[clementine/f14/master: 2/2] Merge branch 'master' into f14

[Dan Horák]

commit d1c7224125173d0790705e7d0e4284d391132981
Merge: 3b96dff a5bb413
Author: Dan Horák <dan at danny.cz>
Date:   Thu Oct 14 23:39:19 2010 +0200

    Merge branch 'master' into f14

 clementine.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---