[samtools/el5/master: 8/8] Merge branch 'master' into el5

[verdurin]

commit 7b6a5ce1474633c1d9774a8e69b12cb746dbcf17
Merge: 475c309 158cb20
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Aug 27 16:51:51 2010 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

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