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

[Orcan Ogetbil]

commit 81118e2b082ce22b76a78b6d90b0e7d0491e0f7c
Merge: 7052247 47a76eb
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Thu Mar 31 22:30:54 2011 -0400

    Merge branch 'master' into f14

 .gitignore      |    1 +
 clementine.spec |   18 +++++++-----------
 sources         |    2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)
---