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

[Vít Ondruch]

commit bf65e21d06e1d671de7bace92430e05d53868969
Merge: e796bca 30c62ab
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Aug 22 15:47:33 2011 +0200

    Merge branch 'master' into f16

 .gitignore            |    1 +
 rubygem-railties.spec |    7 +++++--
 sources               |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---