SVN commit 802862 by staniek:

merge with trunk changes


 M  +236 -306  folderselectiondialog.cpp  
 M  +214 -104  folderselectiondialog.h