[rubygem-gem2rpm/f15: 2/2] Merge branch 'master' into f15

[Vít Ondruch]

commit 32c20bb61da6ef1136445e0e01c62253f74f8e78
Merge: 2dbe353 1dfc5c8
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Jun 30 12:52:00 2011 +0200

    Merge branch 'master' into f15

 .gitignore           |    2 +
 rubygem-gem2rpm.spec |   71 +++++++++++++++++++++++++++++++++-----------------
 sources              |    3 +-
 3 files changed, 51 insertions(+), 25 deletions(-)
---