[bwa/f13/master: 5/5] Merge branch 'master' into f13

[verdurin]

commit d9a4fa8ee2e6bf1ef723c689f7bfc2688bc6fa8f
Merge: 1dd6636 2a9f6e1
Author: Adam Huffman <bloch at verdurin.com>
Date:   Thu Feb 17 16:10:51 2011 +0000

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	bwa.spec
    	sources

 .gitignore |    1 +
 bwa.spec   |   11 ++++++++++-
 sources    |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --cc bwa.spec
index 0a38ab1,7cab181..0b389b8
--- a/bwa.spec
+++ b/bwa.spec
@@@ -50,6 -50,12 +50,15 @@@ 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