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

[verdurin]

commit 311793668bb3f6d4dc81cfbb8e6f759ef132d831
Merge: c86691e 31a925c
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Jan 14 10:11:16 2011 +0000

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

 .gitignore |    1 +
 bwa.spec   |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---