[rubygem-cairo/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 319239b3a7e7e94c8d6affb3dc9304b6e529e1ed
Merge: 4937b90 192dce8
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 3 14:59:40 2012 +0200

    Merge branch 'master' into f17

 cairo-1.10.0-ext.cairo.depend |    2 --
 rubygem-cairo.spec            |   23 ++++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)
---