commit 92940630f4a2d1eb80cdace482851aa05cd59ceb Merge: 8a83469 aa11924 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Fri Mar 30 14:08:26 2012 -0500 Merge branch 'master' into f16 .gitignore | 1 + kimono.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---