[bwa/el5/master: 6/6] Merge branch 'master' into el5

[verdurin]

commit 31a925c6f92310c50909f5906837d169f53a6683
Merge: 73fa476 57324e7
Author: Adam Huffman <bloch at verdurin.com>
Date:   Wed Jan 5 17:59:31 2011 +0000

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

 .gitignore |    1 +
 bwa.spec   |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc bwa.spec
index 1196e85,0a38ab1..d8cfc49
--- a/bwa.spec
+++ b/bwa.spec
@@@ -50,6 -50,9 +50,12 @@@ rm -rf %{buildroot
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Jan  5 2011 Adam Huffman <bloch at verdurin.com> - 0.5.8c-1
+ - upstream bugfix release
+ 
++>>>>>>> master
  * Tue Jul 20 2010 Adam Huffman <bloch at verdurin.com> - 0.5.8a-1
  - new upstream release