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

[verdurin]

commit 914d256425cc9beb263f2ee38c730be503eeead5
Merge: cd32f94 720230e
Author: Adam Huffman <bloch at verdurin.com>
Date:   Tue Nov 1 16:50:59 2011 +0000

    Merge branch 'master' into f14

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