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

[Rex Dieter]

commit 93d41fd90e8ce5df38ee8baedc567c6ee99a66fe
Merge: 46aeef4 a3fe922
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:11:43 2013 -0500

    Merge branch 'master' into f19

 .gitignore   |    5 +++++
 katomic.spec |   23 ++++++++++++++++++++++-
 sources      |    2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)
---