From 8fcaef200424ae2cf304c4caea593fc9f975ab8e Mon Sep 17 00:00:00 2001
From: Fedora <liangsuilong@gmail.com>
Date: Aug 07 2010 09:48:29 +0000
Subject: Merge branch 'master' into f14/master


Conflicts:
	.gitignore
	ailurus.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 9490ba2..b4a9637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 ailurus-10.07.8.tar.gz
+<<<<<<< HEAD
 ailurus-10.08.1.tar.gz
+=======
+ailurus-10.08.2.tar.gz
+>>>>>>> master
diff --git a/ailurus.spec b/ailurus.spec
index 5892601..f4f1fdc 100644
--- a/ailurus.spec
+++ b/ailurus.spec
@@ -4,7 +4,11 @@
 %endif
 
 Name:			ailurus
+<<<<<<< HEAD
 Version:		10.08.1
+=======
+Version:		10.08.2
+>>>>>>> master
 Release:		1%{?dist}
 Summary:		A simple application installer and GNOME tweaker
 Group:			Applications/System
@@ -75,10 +79,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/ailurus*.egg-info
 
 %changelog
+<<<<<<< HEAD
 * Tue Aug 03 2010 Liang Suilong <liangsuilong@gmail.com> 10.08.1-1
 - Upstream to 10.08.1
 
 * Sun Aug 01 2010 Liang Suilong <liangsuilong@gmail.com> 10.07.8-2
+=======
+* Sat Aug 07 2010 Liang Suilong <liangsuilong@gmail.com> 10.08.2-1
+- Upstream to 10.08.2
+
+* Tue Aug 03 2010 Liang Suilong <liangsuilong@gmail.com> 10.08.1-1
+- Upstream to 10.08.1
+
+* Sun Aug 1 2010 Liang Suilong <liangsuilong@gmail.com> 10.07.8-2
+>>>>>>> master
 - Remove changelong in /usr/share/ailurus
 - Add some documents
 
diff --git a/sources b/sources
index 33993d4..c722057 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 ddfc680c3693e1ba1ab250ef0b9fe59f  ailurus-10.08.1.tar.gz
+=======
+257722fd90fec2100124e7505914cb98  ailurus-10.08.2.tar.gz
+>>>>>>> master