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

[hannes]

commit 125f4de8956fbb3f6671630f155d479c3a31638c
Merge: d406820 65b3be4
Author: hannes <hannes at fedoraproject.org>
Date:   Tue Jan 3 23:00:40 2012 +0000

    Merge branch 'master' into f16

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