commit d87fbc9c534175aed9aad542ac1090f8ac7273dd Merge: d8efd8e 66f01a6 Author: Rex Dieter <rdieter at math.unl.edu> Date: Sat Jun 1 21:07:41 2013 -0500 Merge branch 'master' into f17 kdebindings.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---