[rocs/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 89fc0008337b543a98a77999faf82b882522ce84
Merge: dc0a798 27ce172
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:07:16 2012 -0500

    Merge branch 'master' into f16

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