[clementine/f16: 4/4] Merge branch 'f17' into f16

[Rex Dieter]

commit b17a5430add35d3ff7c6f0397519c693ef0fd583
Merge: f6855b3 0fcb831
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 22 08:11:12 2012 -0500

    Merge branch 'f17' into f16

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