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

[hannes]

commit 0b9261547aa229ed13f3a46009296816abd7455f
Merge: 125f4de 0786fa1
Author: hannes <hannes at fedoraproject.org>
Date:   Wed Feb 22 21:54:34 2012 +0000

    Merge branch 'master' into f16

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