[rubygem-glib2/f17: 4/4] Merge branch 'master' into f17

[Vít Ondruch]

commit e281ebd363533d8db56e993ed272112a1536d770
Merge: 52429f7 854c927
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 3 09:39:15 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	rubygem-glib2.spec

 rubygem-glib-1.0.3-test-with-new-glib.patch        |   16 ----------------
 ...m-glib2-0.90.8-include-dsl-for-newer-rake.patch |   10 ----------
 rubygem-glib2.spec                                 |    7 +++++--
 3 files changed, 5 insertions(+), 28 deletions(-)
---