[clementine/f16: 5/5] Merge branch 'master' into f16

[Orcan Ogetbil]

commit 1badc48a2564a0f2a33208190af54be551500106
Merge: 340a52b 39b2561
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Jun 5 22:48:53 2012 -0400

    Merge branch 'master' into f16

 clementine.spec     |   20 ++++++++++++++++----
 imobiledevice.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 4 deletions(-)
---