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

[verdurin]

commit 24193f8908ced4239111850cd735693ea823d49c
Merge: a866f08 ac03d58
Author: Adam Huffman <verdurin at fedoraproject.org>
Date:   Thu Jan 19 09:44:21 2012 +0000

    Merge branch 'master' into el5

 .gitignore    |    1 +
 BEDTools.spec |   19 +++++++++++++++++--
 sources       |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)
---