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

[verdurin]

commit 6e594ce543bfe41e14cff6eb0938543f488d420e
Merge: 981b0c4 11a2f58
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri Jan 14 09:45:55 2011 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	BEDTools.spec
    	sources

 .gitignore    |    2 ++
 BEDTools.spec |   15 ++++++++++-----
 sources       |    4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)
---