[bwa/f21: 5/5] Merge branch 'master' into f21

[verdurin]

commit d49f6ca4b708b9d4fde11a836d96e5e92525ce70
Merge: 8d21f10 b64e0c0
Author: Adam Huffman <bloch at verdurin.com>
Date:   Mon Mar 9 21:48:03 2015 +0000

    Merge branch 'master' into f21

 .gitignore |  2 ++
 bwa.spec   | 18 ++++++++++++------
 sources    |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
---