[kturtle/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit 0651a6d1350569b970cdead876e07547e095e431
Merge: dc5636a bb70f83
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:48:18 2012 -0500

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

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