From c76d67b9a8a779843496596a73623dcc1af0e238 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Dec 04 2010 19:45:48 +0000
Subject: Merge remote branch 'origin/f14/master' into f13/master


Conflicts:
	kdeedu.spec

---

diff --git a/.gitignore b/.gitignore
index e5c9bd7..aa4ca14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdeedu-4.5.2.tar.bz2
 /kdeedu-4.5.3.tar.bz2
+/kdeedu-4.5.4.tar.bz2
diff --git a/kdeedu.spec b/kdeedu.spec
index e56593f..fcdbfbf 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -7,8 +7,8 @@
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
-Version: 4.5.3
-Release: 2%{?dist}
+Version: 4.5.4
+Release: 1%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -581,6 +581,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 02 2010 Than Ngo <than@redhat.com> - 4.5.4-1
+- 4.5.4
+
 * Fri Nov 05 2010 thomas Janssen <thomasj@fedoraproject.org> 4.5.3-2
 - rebuild for new libxml2
 
diff --git a/sources b/sources
index adc84cf..9f9f4e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2787a8872c74b2b447408f588c57da0  kdeedu-4.5.3.tar.bz2
+98d103d11db320a36cdf8e44afbeda71  kdeedu-4.5.4.tar.bz2