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

[verdurin]

commit f4e2b958d3b13109b83e37ad00f0fcfcb236c3f7
Merge: 44e70e6 720230e
Author: Adam Huffman <bloch at verdurin.com>
Date:   Thu Nov 10 23:04:19 2011 +0000

    Merge branch 'master' into el6

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