[midori/f13/master: 12/12] Merge remote branch 'origin/master' into f13/master Fixed conflicts.

[Kevin Fenzi]

commit c5638121f599ed77a6283923e63b1dfe9781a6da
Merge: 096faa0 a39c049
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Sat Oct 2 16:24:59 2010 -0600

    Merge remote branch 'origin/master' into f13/master
    Fixed conflicts.
    
    Conflicts:
    	.gitignore
    	midori.spec
    	sources

 .gitignore  |    3 ++-
 midori.spec |   43 +++++++++++++++++++++++++++++++++++++++++--
 sources     |    2 +-
 3 files changed, 44 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 3d2218e,25aed7f..56deec5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
--midori-0.2.6.tar.bz2
+ /midori-0.2.7.tar.bz2
+ /midori-0.2.8.tar.bz2
diff --cc midori.spec
index c28cea1,4d3cd12..a5f17c8
--- a/midori.spec
+++ b/midori.spec
@@@ -115,8 -133,29 +133,29 @@@ gtk-update-icon-cache %{_datadir}/icons
  #%config(noreplace) %{_sysconfdir}/%{name}/extensions/*/config
  #%{_sysconfdir}/%{name}/
  
+ %files devel
+ %defattr(-,root,root,-)
+ %doc %{_datadir}/gtk-doc/
+ %{_includedir}/*
+ %{_datadir}/vala/vapi/*
  
 -
  %changelog
+ * Wed Sep 29 2010 jkeating - 0.2.8-2
+ - Rebuilt for gcc bug 634757
+ 
+ * Mon Sep 20 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.8-1
+ - Update to 0.2.8
+ 
+ * Tue Aug 24 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.7-1
+ - Update to 0.2.7
+ - Build separate devel package
+ - BuildRequire vala
+ - Include gtk-doc
+ 
+ * Tue Jul 06 2010 Peter Gordon <peter at thecodergeek.com> - 0.2.6-2
+ - Rebuild for WebKitGTK+ ABI bump.
+ 
++>>>>>>> origin/master
  * Mon May 24 2010 Adam Miller <maxamillion at fedoraproject.org> - 0.2.6-1
  - Update to 0.2.6