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

[verdurin]

commit 1254bf97db631764026201b884b2df26c056efc8
Merge: a5f23f0 df8c361
Author: Adam Huffman <bloch at verdurin.com>
Date:   Wed Nov 17 15:01:44 2010 +0000

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

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