[kblocks/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 30bae8b47ea3a170e89e9dde4238ea7aa031ef18
Merge: b3fed81 4996b60
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:12:37 2013 -0500

    Merge branch 'master' into f19

 .gitignore   |    5 +++++
 kblocks.spec |   17 ++++++++++++++++-
 sources      |    2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)
---