[katomic/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit 571a888d7f3ddfe7da28ca93912e1e526d18b399
Merge: 937006c 37bc92e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:32:31 2014 -0600

    Merge branch 'master' into f20

 .gitignore   |    6 ++++++
 katomic.spec |   20 +++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---