[clutter-gtk/f18: 3/3] fix merge

[Peter Robinson]

commit 615cc592e815ac2551becc699501f760b23e5c21
Merge: ffe1bf9 4174fd7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Oct 19 12:36:27 2012 +0100

    fix merge

 clutter-gtk.spec |   11 +++++++----
 sources          |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
---