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

[verdurin]

commit e84d35433359e09be2edd796ff620193cdca4f99
Merge: 16d9e27 635a2bd
Author: Adam Huffman <verdurin at fedoraproject.org>
Date:   Wed Jan 11 15:40:35 2012 +0000

    Merge branch 'master' into el5

 .gitignore       |    1 +
 mmseq-zlib.patch |   10 +++++-----
 mmseq.spec       |   18 +++++++++++++-----
 sources          |    2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)
---