commit ad925c535ce18977ceb10d97e8247f0f70050d9e Merge: b062396 3d6e97c Author: Rex Dieter <rdieter at fedoraproject.org> Date: Tue Nov 6 10:36:52 2012 -0600 Merge branch 'f18' into f17 .gitignore | 3 +-- oxygen-icon-theme.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) ---