[clutter-gst/f16: 2/2] fix merge

[Peter Robinson]

commit f5c777d7db9e7b0ad10ca707ca777046802f5c19
Merge: c6f0b86 f560ab4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Oct 28 13:31:51 2011 +0100

    fix merge

 .gitignore       |    2 +-
 clutter-gst.spec |    6 +++++-
 sources          |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---