From 51d08850b5db9781189d4e1703c25803d520d817 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Mar 02 2011 21:39:07 +0000
Subject: Merge branch 'f13'


This fixes the sources and .gitignore in f14, f15, and rawhide
to actually refer to the 5.10 release, not the 5.8 one. The f13
branch was the only one which got that right.

Conflicts:
	.gitignore
	avrdude.spec

---

diff --git a/.gitignore b/.gitignore
index 53cf7d7..0b53cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-avrdude-5.8.tar.gz
+avrdude-5.10.tar.gz
diff --git a/sources b/sources
index 1bdbdbc..e2208bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d459dcf47fa7fc2a29a70d68ebff4886  avrdude-5.8.tar.gz
+69b082683047e054348088fd63bad2ff  avrdude-5.10.tar.gz