Merge branch 'master' into DEVEL

diff --cc krusader.spec
index 5c015da1f679d8e61f2b64f8853b07a6b036df2e,a87fb2bf458c93f0ffabe27ff754ca92bbf8fa60..1889839800a5fa41f75505fcc33a4ec5d657cc1e
--- 1/krusader.spec
--- 2/krusader.spec
+++ b/krusader.spec
@@@ -8,13 -7,15 +8,13 @@@
  Summary:      Krusader is a filemanager for KDE
  Summary(pl.UTF-8):    Krusader jest zarządcą plików dla KDE
  Name:         krusader
 -Version:      2.0.0
 -Release:      2
 -License:      GPL
 +Version:      2.4.0
 +Release:      0.%{_beta}.1
 +License:      GPL v2+
  Group:                X11/Applications
 -Source0:      http://downloads.sourceforge.net/krusader/%{name}-%{version}.tar.gz
 -# Source0-md5:        f80f500a136d549739ad5d4bcab7fa5f
 -Patch0:               %{name}-desktop.patch
 -Patch1:               %{name}-headers.patch
 +Source0:      http://downloads.sourceforge.net/krusader/%{name}-%{version}-%{_beta}.tar.bz2
 +# Source0-md5:        62a02db3f213bb76805ca6c958e9e263
- URL:          http://krusader.sourceforge.net/
+ URL:          http://www.krusader.org
  BuildRequires:        Qt3Support-devel
  BuildRequires:        QtDBus-devel
  BuildRequires:        QtSvg-devel