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

[verdurin]

commit 15ac6a0429a05ef7d024195c319597d18e61489b
Merge: e830855 cd32f94
Author: Adam Huffman <bloch at verdurin.com>
Date:   Fri May 27 17:37:05 2011 +0100

    Merge branch 'master' into el5

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