[ksnapshot/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 1de5b44929e7f9052d777437c5d7dd710051d772
Merge: 4314718 711af9e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:05:30 2012 -0500

    Merge branch 'master' into f16

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