Merge branch 'master' of github.com:samtools/samtools
authorPetr Danecek <pd3@sanger.ac.uk>
Tue, 12 Mar 2013 13:17:26 +0000 (13:17 +0000)
committerPetr Danecek <pd3@sanger.ac.uk>
Tue, 12 Mar 2013 13:17:26 +0000 (13:17 +0000)

Trivial merge