From f2c0ab88d783b2958689c370d9fa7ed7c7e3e1d9 Mon Sep 17 00:00:00 2001
From: Neal Becker <ndbecker2@gmail.com>
Date: Feb 05 2011 16:44:28 +0000
Subject: Merge branch 'master' into f13


---

diff --git a/.gitignore b/.gitignore
index c0b5355..a41a99c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ mercurial-1.6.2.tar.gz
 /mercurial-1.7.1.tar.gz
 /mercurial-1.7.2.tar.gz
 /mercurial-1.7.3.tar.gz
+/mercurial-1.7.5.tar.gz
diff --git a/mercurial.spec b/mercurial.spec
index 0531d6e..0952193 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -2,7 +2,7 @@
 
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
-Version: 1.7.3
+Version: 1.7.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
@@ -173,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 ##cd tests && %{__python} run-tests.py
 
 %changelog
+* Sat Feb  5 2011 Neal Becker <ndbecker2@gmail.com> - 1.7.5-1
+- Update to 1.7.5
+
 * Sun Jan  2 2011 Neal Becker <ndbecker2@gmail.com> - 1.7.3-1
 - Update to 1.7.3
 
diff --git a/sources b/sources
index ab114f4..b6a3a3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d635ad307fa20a5e9c6afba6145a73b  mercurial-1.7.3.tar.gz
+269e924b3770535cf72049db01c35afa  mercurial-1.7.5.tar.gz