From 258e275c6a9a6c8a11f35c6fb32f08a9e823eb88 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Jun 09 2011 13:22:08 +0000
Subject: Merge branch 'f15' into f14


---

diff --git a/.gitignore b/.gitignore
index 9dedba2..f0661dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdeadmin-4.6.2.tar.bz2
 /kdeadmin-4.6.3.tar.bz2
+/kdeadmin-4.6.4.tar.bz2
diff --git a/kdeadmin.spec b/kdeadmin.spec
index 337875c..19bc3e8 100644
--- a/kdeadmin.spec
+++ b/kdeadmin.spec
@@ -6,7 +6,7 @@
 Name:           kdeadmin
 Summary:        KDE Administrative tools
 Epoch:          7
-Version:        4.6.3
+Version:        4.6.4
 Release:        1%{?dist}
 
 Group:          User Interface/Desktops
@@ -124,6 +124,9 @@ fi
 
 
 %changelog
+* Mon Jun 06 2011 Than Ngo <than@redhat.com> - 7:4.6.4-1
+- 4.6.4
+
 * Fri Apr 29 2011 Rex Dieter <rdieter@fedoraproject.org> 7:4.6.3-1
 - 4.6.3
 
diff --git a/sources b/sources
index 88c13e9..9546b4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ac0a89337a58ddec49be0ca7a4a7534  kdeadmin-4.6.3.tar.bz2
+63176591390ad6234c8d8c2074f9d504  kdeadmin-4.6.4.tar.bz2