[bwa/el6/master: 16/16] Merge branch 'master' into el6

[verdurin]

commit 3928c2478fca56d71bdd9e6eca1c5af1d3ace76e
Merge: 8246ec4 d9a4fa8
Author: Adam Huffman <bloch at verdurin.com>
Date:   Thu Feb 17 16:13:08 2011 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	bwa.spec

 .gitignore |    1 +
 bwa.spec   |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc bwa.spec
index 0a38ab1,0b389b8..7cab181
--- a/bwa.spec
+++ b/bwa.spec
@@@ -50,6 -50,15 +50,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 -<<<<<<< HEAD
 -=======
+ * Thu Feb 17 2011 Adam Huffman <bloch at verdurin.com> - 0.5.9-1
+ - new upstream release 0.5.9
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
 ->>>>>>> master
  * Wed Jan  5 2011 Adam Huffman <bloch at verdurin.com> - 0.5.8c-1
  - upstream bugfix release