Update third_party/psutil and fix the licence issue with it.

third_party/psutil/psutil/error.py

 #!/usr/bin/env python
 #
-# $Id: error.py 744 2010-10-27 22:42:42Z jloden $
+# $Id: error.py 1142 2011-10-05 18:45:49Z g.rodola $
 #
+# Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
-"""psutil exception classes"""
+"""psutil exception classes;  do not import this directly"""
 
 
 class Error(Exception):
     """Base exception class. All other psutil exceptions inherit
     from this one.
     """
 
 class NoSuchProcess(Error):
     """Exception raised when a process with a certain PID doesn't
     or no longer exists (zombie).
@@ skipping 25 matching lines @@
             if (pid is not None) and (name is not None):
                 self.msg = "(pid=%s, name=%s)" % (pid, repr(name))
             elif (pid is not None):
                 self.msg = "(pid=%s)" % self.pid
             else:
                 self.msg = ""
 
     def __str__(self):
         return self.msg
 
+
+class TimeoutExpired(Error):
+    """Raised on Process.wait(timeout) if timeout expires and process
+    is still alive.
+    """
+
+    def __init__(self, pid=None, name=None):
+        self.pid = pid
+        self.name = name
+        if (pid is not None) and (name is not None):
+            self.msg = "(pid=%s, name=%s)" % (pid, repr(name))
+        elif (pid is not None):
+            self.msg = "(pid=%s)" % self.pid
+        else:
+            self.msg = ""
+
+    def __str__(self):
+        return self.msg
+