[samtools/f13/master: 9/9] Merge branch 'master' into f13

[verdurin]

commit c5f153efe6a4653ee91a718b25cdf179523005cc
Merge: be4d4fe 02e484b
Author: Adam Huffman <bloch at verdurin.com>
Date:   Tue Nov 23 21:24:34 2010 +0000

    Merge branch 'master' into f13
    
    Conflicts:
    	samtools.spec

 samtools.spec |   50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 44 insertions(+), 6 deletions(-)
---