[kdetoys/f14/master: 9/9] Merge remote-tracking branch 'origin/master' into f14

[Jaroslav Reznik]

commit bf4acdd2cffaf69664616fe638354a273697cb6f
Merge: 3b1c166 a991d0e
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Wed Mar 16 15:48:13 2011 +0100

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	kdetoys.spec
    	sources

 .gitignore   |    2 +-
 kdetoys.spec |   27 +++++++++++++++++++++------
 sources      |    2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)
---
diff --cc kdetoys.spec
index d2fc94b,cf9ef7b..b9c5be6
--- a/kdetoys.spec
+++ b/kdetoys.spec
@@@ -7,10 -7,10 +7,10 @@@ Release:        1%{?dist
  License:        GPLv2
  Group:          Amusements/Graphics
  URL:            http://www.kde.org/
- Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+ Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
 -# upstream patches
 +# upstream patches, stable branch
  
  # need kdebase-workspace-devel for KTux
  BuildRequires: kdebase-workspace-devel >= %{version}