[batik/f17: 6/6] Merge branch 'master' into f17

[Mikolaj Izdebski]

commit 4d6ce9121a78353fbbc9d5c85b9439306e57e714
Merge: fe06080 5b7d725
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Oct 5 02:47:42 2012 +0200

    Merge branch 'master' into f17

 batik.rasterizer.script |    2 +-
 batik.spec              |   72 +++++++++++++++-------------------------------
 2 files changed, 25 insertions(+), 49 deletions(-)
---