[miredo/f13/master: 3/3] Merge branch 'master' into f13

[jens]

commit 4bd68fcd88c1e3e0de8124873f8767cea016783c
Merge: 5b3623f e636f64
Author: Jens Kuehnel <fedora-package at jens.kuehnel.org>
Date:   Wed Aug 4 22:40:55 2010 +0200

    Merge branch 'master' into f13

 miredo.spec                            |    7 ++++++-
 reread-resolv-before-resolv-ipv4.patch |   16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)
---