commit cdf38b24211745d2f483cf99e8ed20a31dcf1a80 Merge: fb8ef76 506c972 Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:48:33 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + smokegen.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---