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

[verdurin]

commit e45551316e5f90bc5d0e42a2821bed9e529d657f
Merge: 15ac6a0 720230e
Author: Adam Huffman <bloch at verdurin.com>
Date:   Thu Nov 10 23:12:28 2011 +0000

    Merge branch 'master' into el5

 .gitignore |    1 +
 bfast.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---