Merge branch 'master' of gitorious.org:opensuse/kdebase4-opensuse
authorStephan Kulow <coolo@suse.de>
Tue, 11 Oct 2011 15:37:17 +0000 (17:37 +0200)
committerStephan Kulow <coolo@suse.de>
Tue, 11 Oct 2011 15:37:17 +0000 (17:37 +0200)
commit030046ffedc8ffed31685d9bfe197cb0be00fd58
treeeeb2bcad3c039155ee04412bbaeab5a9f01f0369
parentf71b843c9a987b39353ccd59e2e27be3a95ff0b2
parentdf30c908e41367c8898fe6b931a8ae726a15f6eb
Merge branch 'master' of gitorious.org:opensuse/kdebase4-opensuse

Conflicts:
config-files/usr/share/kde4/apps/plasma-desktop/updates/add-f1-shortcut.js
config-files/usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js