From 853e23774142ec749decf9bbd94546ac3dc0a3b2 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: May 23 2012 06:21:51 +0000
Subject: Merge branch 'master' into f17 so they have the same history.


---

diff --git a/numad.spec b/numad.spec
index cb8c0dd..369aaca 100644
--- a/numad.spec
+++ b/numad.spec
@@ -2,7 +2,7 @@
 
 Name: numad
 Version: 0.5
-Release: 3.20120221git%{?dist}
+Release: 4.20120522git%{?dist}
 Summary: NUMA user daemon
 
 License: LGPLv2
@@ -74,6 +74,9 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Wed May 23 2012 Jan Synáček <jsynacek@redhat.com> - 0.5-4.20120522git
+- update source (20120522) and manpage
+
 * Tue Mar 06 2012 Jan Synáček <jsynacek@redhat.com> 0.5-3.20120221git
 - update source
 - drop the patch
diff --git a/sources b/sources
index 4658d7d..b434d43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32203166a88ed40a825c22dffbc19868  numad-0.5git.tar.xz
+15e323077951ca49bf799f702824b0fb  numad-0.5git.tar.xz