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

[verdurin]

commit 79a40b8e13a77358c95c275cc0a9d37f5539fb03
Merge: 80dad4b 9ce95ec
Author: Adam Huffman <bloch at verdurin.com>
Date:   Thu Sep 8 17:47:21 2011 +0100

    Merge branch 'master' into f14

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