[rocs/f16: 13/13] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit dc0a798dadb627365073bc9f4745f349233bb359
Merge: 3e88c72 cdbe087
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:55:05 2012 -0600

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

 .gitignore |    4 +---
 rocs.spec  |   39 ++++++++++++++++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 36 insertions(+), 9 deletions(-)
---