From 30b8c3bc25f0f6d34b0c1f1e28c33df53987731a Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Feb 18 2011 09:16:40 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/abrt


Conflicts:
	abrt.spec

---

diff --git a/abrt.spec b/abrt.spec
index 6bc19ac..bd87f0f 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -496,6 +496,9 @@ fi
 * Fri Feb 18 2011 Jiri Moskovcak <jmoskovc@redhat.com> 1.1.17-2
 - removed gnome-python2-vfs dependency
 
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.17-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Feb 05 2011 Jiri Moskovcak <jmoskovc@redhat.com> 1.1.17-1
 - rewritten abrt-debuginfo-install script to use the yum API
 - GUI: added search box to backtrace view rhbz#612017 (jmoskovc@redhat.com)