[gnash/f13/master: 7/7] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/gnash into f13/master

[Kevin Kofler]

commit dfaed9a5192ed152c30249d828183bf0ce80c33f
Merge: 9f936b5 678a722
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Oct 2 14:37:33 2010 +0200

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/gnash into f13/master

 gnash.spec |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
---