[kalzium/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 13359822873aa3c7a3fcdc8da3833135fe9c90df
Merge: 3adb8a9 4e70f27
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:35:22 2012 +0100

    Merge branch 'f18' into f17

 .gitignore   |    1 +
 kalzium.spec |    6 ++++--
 sources      |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---