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

[Vít Ondruch]

commit 0a8add49beee0d0012ed7c065116e073f9c9014f
Merge: 72d2884 e43ab9b
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Jun 22 10:32:03 2011 +0200

    Merge branch 'master' into f15

 sources |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---