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

[verdurin]

commit ada7fbf0253ca56e6a4cbaeefe4f3ab6c586ab2e
Merge: c3ea6aa 9ce95ec
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Sep 9 16:42:20 2011 +0100

    Merge branch 'master' into el5

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