Merge branch 'V9_2_2_BR' into V9_2_BR

diff --cc src/Container/Container_i.cxx
index d34b36ba839674dd460eded40ab72b38c99b31ff,92db1e0adcfee23f14e16ff12cae5d84593e66aa..61f7fd177f7578030f90fa8df828d95717b4c3e6
--- 1/src/Container/Container_i.cxx
--- 2/src/Container/Container_i.cxx
+++ b/src/Container/Container_i.cxx
@@@ -1853,8 -1853,8 +1853,8 @@@ void Engines_Container_i::clearTemporar
  {
    std::list<std::string>::const_iterator it;
    for ( it = _tmp_files.begin(); it != _tmp_files.end(); ++it ) {
 -#ifdef WIN32    
 +#ifdef WIN32
-     std::string command = "del /F /P";
+     std::string command = (GetFileAttributes((*it).c_str()) == FILE_ATTRIBUTE_DIRECTORY) ? "rd /Q \"" : "del /F /Q \"";
  #else
      std::string command = "rm -rf ";
  #endif