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

[Peter Robinson]

commit c6f0b867a22052c9ec00562cd4bb79de27262caf
Merge: f88390b 2dcc73c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Oct 5 12:10:54 2011 +0100

    fix merge

 clutter-gst.spec |    7 ++++++-
 sources          |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc clutter-gst.spec
index cb9451e,2f78a0d..12ca92d
--- a/clutter-gst.spec
+++ b/clutter-gst.spec
@@@ -66,15 -66,17 +66,20 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gir-1.0/ClutterGst-1.0.gir
  
  %changelog
+ * Wed Oct  5 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.4.2-1
+ - New stable 1.4.2
+ - ftp://ftp.gnome.org/pub/gnome/sources/clutter-gst/1.4/clutter-gst-1.4.2.news
+ 
  * Sat Oct  1 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.4.0-1
  - New stable 1.4.0
+ - ftp://ftp.gnome.org/pub/gnome/sources/clutter-gst/1.4/clutter-gst-1.4.0.news
  
 -* Tue Sep 20 2011 Matthias Clasen <mclasen at redhat.com> 1.3.12-3
 +* Tue Sep 20 2011 Matthias Clasen <mclasen at redhat.com> 1.3.14-2
  - Rebuild
  
 +* Fri Sep 02 2011 Bastien Nocera <bnocera at redhat.com> 1.3.14-1
 +- Update to 1.3.14
 +
  * Wed Jun 29 2011 Dan Horák <dan[at]danny.cz> 1.3.12-2
  - use dolt on all Linuxes, workarounds issue with internal libtool