[bwa/f13/master: 3/3] Merge branch 'master' into f13

[verdurin]

commit 1dd66361c619652d9ce31b7b040f97c9ef0f16c1
Merge: 9ef7747 57324e7
Author: Adam Huffman <bloch at verdurin.com>
Date:   Wed Jan 5 17:49:12 2011 +0000

    Merge branch 'master' into f13

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