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

[Rex Dieter]

commit 3d3f39927e6f42c1a60ca919708958ae4a3dfdee
Merge: f0d9a3d 7dba7ac
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:47:25 2012 -0500

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

 .gitignore  |    3 +--
 ktimer.spec |   27 +++++++++++++++++++++------
 sources     |    2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)
---