[kremotecontrol/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit ffdab8699b57659b4d9d66488e7de9dbcbeb94bf
Merge: 1d6d78f 14d4c3c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:32:10 2013 -0600

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

 .gitignore          |    7 +------
 kremotecontrol.spec |   21 ++++++++++++++++++---
 sources             |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---