commit 4d2a7c02d018972b1e1ddfe553181148a38b532b Merge: c1ac955 a09aa65 Author: Rex Dieter <rdieter at math.unl.edu> Date: Wed Mar 6 16:39:44 2013 -0600 Merge branch 'f18' into f17 .gitignore | 7 +------ libksane.spec | 23 +++++++++++++++++++---- sources | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) ---