Merge remote branch 'cros/upstream' into master

client/tests/kvm/cd_hash.py

 #!/usr/bin/python
 """
 Program that calculates several hashes for a given CD image.
 
 @copyright: Red Hat 2008-2009
 """
 
 import os, sys, optparse, logging
 import common
 import kvm_utils
-from autotest_lib.client.common_lib import logging_config, logging_manager
+from autotest_lib.client.common_lib import logging_manager
 from autotest_lib.client.bin import utils
 
 
 if __name__ == "__main__":
     parser = optparse.OptionParser("usage: %prog [options] [filenames]")
     options, args = parser.parse_args()
 
     logging_manager.configure_logging(kvm_utils.KvmLoggingConfig())
 
     if args:
@@ skipping 17 matching lines @@
 
         logging.info("Hash values for file %s", os.path.basename(filename))
         logging.info("md5    (1m): %s", utils.hash_file(filename, 1024*1024,
                                                         method="md5"))
         logging.info("sha1   (1m): %s", utils.hash_file(filename, 1024*1024,
                                                         method="sha1"))
         logging.info("md5  (full): %s", utils.hash_file(filename, method="md5"))
         logging.info("sha1 (full): %s", utils.hash_file(filename,
                                                         method="sha1"))
         logging.info("")