[clutter/f16: 2/2] fix merge

[Peter Robinson]

commit d7280dabc91b60c384054753718c865289918002
Merge: a9e75b4 5dde5ea
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jan 31 01:08:11 2012 +0000

    fix merge

 0001-Fix-Brazilian-Portuguese-translation.patch |   36 +++++++++++++++++++++++
 clutter.spec                                    |    7 ++++
 2 files changed, 43 insertions(+), 0 deletions(-)
---
diff --cc clutter.spec
index e33d90f,893b097..2eb873a
--- a/clutter.spec
+++ b/clutter.spec
@@@ -93,10 -97,9 +97,13 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gtk-doc/html/cally
  
  %changelog
 +* Tue Jan 31 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.8.4-1
 +- 1.8.4 stable release
 +- http://ftp.gnome.org/pub/GNOME/sources/clutter/1.8/clutter-1.8.4.news
 +
+ * Thu Dec 01 2011 Bastien Nocera <bnocera at redhat.com> 1.8.2-3
+ - Fix critical warning on clutter application startup
+ 
  * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.2-2
  - Rebuilt for glibc bug#747377