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

[Rex Dieter]

commit 89b7cd9511300fdb4fbc509c653fcf8bcf0b665f
Merge: 89fc000 9c1926b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 23:05:28 2012 -0500

    Merge branch 'master' into f16

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