From 6c7e77b4ba8e081bf5a25a28cf68491cd6114fcc Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@fedoraproject.org>
Date: Jan 27 2009 02:59:06 +0000
Subject: updates to new version 3.2.1


---

diff --git a/nsd.spec b/nsd.spec
index 7a17036..89248dd 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,7 +1,12 @@
 Summary: fast and lean authoritative DNS name server
 Name: nsd
+<<<<<<< nsd.spec
+Version: 3.2.1
+Release: 1%{?dist}
+=======
 Version: 3.2.0
 Release: 4%{?dist}
+>>>>>>> 1.43
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 #Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -92,6 +97,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Jan 26 2009 Paul Wouters <paul@xelerance.com> - 3.2.1-1
+- Updated to new version 3.2.1
+
 * Sat Jan 17 2009 Tomas Mraz <tmraz@redhat.com> - 3.2.0-4
 - rebuild with new openssl