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

[verdurin]

commit d1ac49307911f3d84747932ec3b9ef98e33a9a84
Merge: 4b0dddb d0bec83
Author: Adam Huffman <bloch at verdurin.com>
Date:   Thu Feb 17 15:39:24 2011 +0000

    Merge branch 'master' into f14

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