[samtools/el6: 2/2] Merge branch 'master' into el6

[verdurin]

commit 2d4de615a704dbdcdf42720fd1c2fcb8878f3c4a
Merge: df02cfb 9167a44
Author: Adam Huffman <bloch at verdurin.com>
Date:   Wed Oct 26 17:41:28 2011 +0100

    Merge branch 'master' into el6

 samtools.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---