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

[verdurin]

commit df02cfb04e8134958f26444d2fc2d08bf388647c
Merge: ce6f338 1239e16
Author: Adam Huffman <bloch at verdurin.com>
Date:   Tue Sep 6 11:44:43 2011 +0100

    Merge branch 'master' into el6

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