[rocs/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit 3fbaf6b8508056c253b2021b431679246355511e
Merge: 57f5e94 003abaf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:51:40 2012 -0500

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

 .gitignore |    3 +--
 rocs.spec  |   29 ++++++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)
---