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

[Rex Dieter]

commit 5cd1356d11c5bb076f411a7c8a1cc72ae87e41c3
Merge: 0179b27 b12a5d3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:28:11 2012 -0500

    Merge branch 'f17' into f16

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