From 0b593f43983ac553ca1ab4ba6817edeeb28ef969 Mon Sep 17 00:00:00 2001
From: Chen Lei <supercyper@163.com>
Date: Aug 07 2010 18:50:20 +0000
Subject: Sync with master


---

diff --git a/.gitignore b/.gitignore
index b4a9637..de06973 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
 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 6bd1efa..7a740da 100644
--- a/ailurus.spec
+++ b/ailurus.spec
@@ -42,7 +42,7 @@ desktop-file-install \
 	${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name} --with-gnome
 rm -f $RPM_BUILD_ROOT%{_datadir}/PolicyKit/policy/cn.ailurus.policy
-#rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/ChangeLog
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/ChangeLog
 
 
 %clean
diff --git a/sources b/sources
index 68d170f..46ca4fe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 257722fd90fec2100124e7505914cb98  ailurus-10.08.2.tar.gz
-