[fife/f15: 3/3] Merge branch 'master' into f15

[Bruno Wolff III]

commit 8f6a3e9ff17c893de49662f6be0f76ffbba1e0cc
Merge: 1d2e362 4315d7f
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Jul 10 11:11:36 2011 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	fife.spec

 fife.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc fife.spec
index 636d191,1036351..5289b37
--- a/fife.spec
+++ b/fife.spec
@@@ -210,6 -210,9 +210,12 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Thu Jun 02 2011 Bruno Wolff III <bruno at wolff.to> - 1:0.3.2-5.r2
+ - Rebuild for guichan 0.8.2 soname bump
+ 
++>>>>>>> master
  * Mon Apr 18 2011 Tom Callaway <spot at fedoraproject.org> - 1:0.3.2-4.r2
  - update to 0.3.2r2