commit 875ad1f6d6e7be996aca8010d985ada45a9f1a82 Merge: 77ce3ba 79ad32b Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Dec 29 09:21:31 2011 -0600 Merge branch 'f16' into f15 .gitignore | 2 +- kmymoney.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) ---