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

[Vít Ondruch]

commit 12ae5be9a92b20fa783c158631b76681cd1956e0
Merge: cd9e200 25b852d
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Jun 24 14:00:41 2011 +0200

    Merge branch 'master' into f15

 rubygem-tilt.spec |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)
---