[kturtle/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 849f745b39f7824689e0e54c8fa45421c16c0c7e
Merge: fb0a4b9 cd6e824
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:52:32 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kturtle.spec
    	sources

 .gitignore   |    4 +---
 kturtle.spec |   29 +++++++++++++++++++++++++----
 sources      |    2 +-
 3 files changed, 27 insertions(+), 8 deletions(-)
---