From: Aaron Seigo <aseigo@kde.org>
Date: Wed, 21 Dec 2011 16:08:23 +0000 (+0100)
Subject: Merge remote branch 'origin/KDE/4.8'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/5e0e05e8f0c82e987cc56a17bdac1718e8feb320

Merge remote branch 'origin/KDE/4.8'

Conflicts:
	plasma/applets/folderview/folderview.cpp
---

5e0e05e8f0c82e987cc56a17bdac1718e8feb320