commit 8a834692ddffe2cdc3e2c08bf6bb7edf29eb8b44 Merge: 4d7a4fb dc88b0c Author: Rex Dieter <rdieter at fedoraproject.org> Date: Fri Mar 23 10:26:50 2012 -0500 Merge branch 'f17' into f16 kimono.spec | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) ---