commit 18df389d0b8a322df3573d72dba845c5db73c33e Merge: 3983b1b 78910cb Author: Rex Dieter <rdieter at math.unl.edu> Date: Wed Mar 6 13:52:54 2013 -0600 Merge branch 'f18' into f17 .gitignore | 4 +--- oxygen-icon-theme.spec | 22 +++++++++++++++++----- sources | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) ---