[groovy/f16: 5/6] Merge branch 'master' into f16

[hannes]

commit 4d79f86a8924e847b6396ab4753f67340f46cfb2
Merge: ce7663a 4751e03
Author: hannes <hannes at fedoraproject.org>
Date:   Sun Oct 16 20:28:25 2011 +0200

    Merge branch 'master' into f16

 .gitignore                 |    1 +
 groovy-1.8.1-nojansi.patch |  643 --------------------------------------------
 groovy.spec                |   19 +-
 sources                    |    2 +-
 4 files changed, 15 insertions(+), 650 deletions(-)
---