[miredo/el5/master: 6/7] Merge branch 'master' into el5

[jens]

commit 6acb1eaa05ea0e24c669b0e4d0a06e790362bf04
Merge: 79ccb02 e636f64
Author: Jens Kuehnel <fedora-package at jens.kuehnel.org>
Date:   Wed Aug 4 22:55:31 2010 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	miredo.spec

 miredo.spec                            |    8 +++++++-
 reread-resolv-before-resolv-ipv4.patch |   16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --cc miredo.spec
index e6319bd,20f571b..798a047
--- a/miredo.spec
+++ b/miredo.spec
@@@ -205,6 -207,9 +207,10 @@@ rm -rf %{buildroot
  
  
  %changelog
++=======
+ * Wed Aug 04 2010 "Jens Kuehnel <fedora-package at jens.kuehnel.org>" - 1.1.7-5
+ - Fixed BZ#606106 - miredo-client fails to notice resolv.conf changes
+ 
  * Thu Jul 30 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-4
  - Fix Obsoletes for smooth upgrade