[miredo/f12/master: 4/4] Merge branch 'master' into f12

[jens]

commit 80610bbe30c992f1d8d20104128d4a22b50c90b6
Merge: 121d897 e636f64
Author: Jens Kuehnel <fedora-package at jens.kuehnel.org>
Date:   Wed Aug 4 22:45:33 2010 +0200

    Merge branch 'master' into f12

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