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

[verdurin]

commit ce6f338286ecfde8ad0d1b7b173868fbf282ab88
Merge: c4bda1c 4a3dd6e
Author: Adam Huffman <bloch at verdurin.com>
Date:   Sat May 14 00:44:52 2011 +0100

    Merge branch 'master' into el6

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