[goldendict/f13/master: 2/2] Merge branch 'master' into f13

[helloworld1]

commit 2d8ac57b858bf0cfa4cb6f130b1c850bb7d886a5
Merge: aa61bce 6fa0bd6
Author: Howard Liberty <liberty at anymemo.org>
Date:   Mon Dec 13 09:04:13 2010 -0500

    Merge branch 'master' into f13

 goldendict.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---