From 3928c2478fca56d71bdd9e6eca1c5af1d3ace76e Mon Sep 17 00:00:00 2001
From: Adam Huffman <bloch@verdurin.com>
Date: Feb 17 2011 16:13:08 +0000
Subject: Merge branch 'master' into el6


Conflicts:
	bwa.spec

---

diff --git a/.gitignore b/.gitignore
index c672758..bd30f0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 bwa-0.5.8a.tar.bz2
 /bwa-0.5.8c.tar.bz2
+/bwa-0.5.9.tar.bz2
diff --git a/bwa.spec b/bwa.spec
index 0a38ab1..7cab181 100644
--- a/bwa.spec
+++ b/bwa.spec
@@ -1,5 +1,5 @@
 Name:           bwa
-Version:        0.5.8c
+Version:        0.5.9
 Release:        1%{?dist}
 Summary:        Burrows-Wheeler Alignment tool
 
@@ -50,6 +50,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 17 2011 Adam Huffman <bloch@verdurin.com> - 0.5.9-1
+- new upstream release 0.5.9
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Wed Jan  5 2011 Adam Huffman <bloch@verdurin.com> - 0.5.8c-1
 - upstream bugfix release
 
diff --git a/sources b/sources
index 697b110..e081681 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7685468334d2e56e50dc3a2be96192cd  bwa-0.5.8c.tar.bz2
+27facf40c92e9af40def844b245ed7db  bwa-0.5.9.tar.bz2