[mmseq/el5: 4/4] Merge branch 'master' into el5

[verdurin]

commit 90de68fd168ed537c026d270386839b8ff16e3c3
Merge: b502a87 0278f50
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Oct 7 17:10:38 2011 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	mmseq-flags.patch

 .gitignore             |    1 +
 mmseq-flags.patch      |   26 +++++---------------------
 mmseq-sam-header.patch |   10 ++++++----
 mmseq.spec             |    5 ++++-
 sources                |    2 +-
 5 files changed, 17 insertions(+), 27 deletions(-)
---