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

[Than Ngo]

commit fd82cf97fc1ccd184ec62bf3bc93c16863225b52
Merge: bb86493 1b6c4e9
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:41:26 2012 +0100

    Merge branch 'f18' into f17

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