[gkrellm-volume/f13/master: 3/3] Merge branch 'master' into f13

[Ville Skyttä]

commit 22a0e1ba2719d407f37ff92e5a71398b2730ab87
Merge: 044aaf2 724d7b4
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Aug 5 22:56:32 2010 +0300

    Merge branch 'master' into f13

 gkrellm-volume-2.1.13-reenable.patch |   14 ++++++++++++++
 gkrellm-volume.spec                  |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---