[emerillon/f16: 2/2] fix merge

[Peter Robinson]

commit d66d6fa5e21f96793218d8debfa71c214c6e0a1a
Merge: a634a83 4d324db
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 11 11:59:57 2011 +0100

    fix merge

 emerillon.spec |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)
---
diff --cc emerillon.spec
index 4ece6b9,03016e8..ff0bd98
--- a/emerillon.spec
+++ b/emerillon.spec
@@@ -99,13 -92,13 +99,16 @@@ f
  %{_datadir}/vala/vapi/%{name}.*
  
  %changelog
+ * Tue Oct 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.1.90-3
+ - Rebuild
+ 
 +* Wed Oct 05 2011 Karsten Hopp <karsten at redhat.com> 0.1.90-2.fc16.1
 +- drop sed scripts which changed libchamplain versions to 0.10
 +
- * Thu Sep 22 2011 Peter Robinson <pbrobinson at gmail.com> - 0.1.90-2
+ * Thu Sep 22 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.1.90-2
  - Bump build for new cogl/champlain
  
- * Wed Sep  7 2011 Peter Robinson <pbrobinson at gmail.com> - 0.1.90-1
+ * Wed Sep  7 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.1.90-1
  - New upstream release with support for gtk3/libpeas/GSettings
  
  * Tue May  3 2011 Tom Callaway <spot at fedoraproject.org> 0.1.2-17