[BEDTools/f13/master: 7/7] Merge branch 'master' into f13

[verdurin]

commit 49994c4b28ba040da084c9288f4be86fa425b498
Merge: 8a33360 85fd46d
Author: Adam Huffman <bloch at verdurin.com>
Date:   Tue Apr 12 15:10:10 2011 +0100

    Merge branch 'master' into f13

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