commit b212fb930eafaf0bdffb3bc27eb1b5ea167e906f Merge: 7fbe8c0 badb47a Author: Than Ngo <than at redhat.com> Date: Thu Dec 6 15:47:56 2012 +0100 Merge branch 'f18' into f17 .gitignore | 1 + qyoto.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) ---