[kremotecontrol/f17: 8/8] Merge branch 'master' into f17

[Rex Dieter]

commit 90f08b2d81eb3ad1314355fd89616067d3d8b8e8
Merge: 5d8056e 987761b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:44:17 2012 -0500

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

 .gitignore          |    3 +--
 kremotecontrol.spec |   22 +++++++++++++++++-----
 sources             |    2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)
---