[rubygem-rails/f16: 2/2] Merge branch 'master' into f16

[Vít Ondruch]

commit bb4b708914bf6d2c9a5fc23407f7a39af4d1b7e0
Merge: 287d934 ab9eae9
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Aug 22 15:52:17 2011 +0200

    Merge branch 'master' into f16

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