* Added IPersistFolder2 interface to CMergedFolder, per MSDN suggestion. * Changed the way the pidl info is stored to be more clean and readable. svn path=/branches/shell-experiments/; revision=63669