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

[hannes]

commit 273f32d60ba1b5257c01039f9df5017c137d8404
Merge: d5fa858 37102a4
Author: hannes <hannes at fedoraproject.org>
Date:   Fri Mar 9 20:51:43 2012 +0000

    Merge branch 'master' into f16

 groovy-script |    2 +-
 groovy.spec   |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---