[ksnapshot/f17: 10/10] Merge branch 'master' into f17

[Rex Dieter]

commit c684d0e6363e9963fa5dfce047c0cbab5ff524ae
Merge: b12a5d3 f544509
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:46:25 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	ksnapshot.spec
    	sources

 .gitignore     |    3 +--
 ksnapshot.spec |   28 +++++++++++++++++++++++-----
 sources        |    2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)
---