[clutter: 5/5] fix merge

[Peter Robinson]

commit 2cb6ff7f986cb68b906247441c428f3d3d841c94
Merge: 7d16a70 22e7a53
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Sep 3 23:17:45 2012 +0100

    fix merge

 clutter.spec |   13 ++++++++-----
 sources      |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)
---