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

[hannes]

commit d5fa8580696adcbeacd44375a29c2ff63e2cd8b4
Merge: 0b92615 de8ed09
Author: hannes <hannes at fedoraproject.org>
Date:   Sat Mar 3 11:41:17 2012 +0000

    Merge branch 'master' into f16

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