[bfast/el5/master: 4/4] Merge branch 'master' into el5

[verdurin]

commit e8308553b2add1d8171505deb14da1465c2c7a25
Merge: 7940dda 64aa1f7
Author: Adam Huffman <bloch at verdurin.com>
Date:   Wed Nov 17 13:00:44 2010 +0000

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

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