Merge 1.4.1 into trunk

This commit is contained in:
Nick Bolton 2010-06-12 17:20:54 +00:00
parent 1698161945
commit a8eb2a3bfd
27 changed files with 841 additions and 351 deletions

View file

@ -30,7 +30,7 @@ CMSWindowsRelauncher::startAsync()
void
CMSWindowsRelauncher::startThread(void*)
{
LOG((CLOG_DEBUG "starting relaunch loop"));
LOG((CLOG_NOTE "starting relaunch service"));
int ret = relaunchLoop();
// HACK: this actually throws an exception to exit with 0 (nasty)