[rocs/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 9a8482d87897ab390ade3bfc7b2a910f5fdd94bf
Merge: 82dc733 57f5e94
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 07:33:02 2012 -0500

    Merge branch 'f17' into f16

 .gitignore |    1 +
 rocs.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---