Fixing leftover from prior reveiew, plus more lint.

pylib/gyp/MSVSUserFile.py

-# Copyright (c) 2009 Google Inc. All rights reserved.
+# Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Visual Studio user preferences file writer."""
 
-import common
 import os
 import re
 import socket # for gethostname
+
+import gyp.common
 import gyp.easy_xml as easy_xml
 
 
 #------------------------------------------------------------------------------
 
 def _FindCommandInPath(command):
   """If there are no slashes in the command given, this function
      searches the PATH env to find the given command, and converts it
      to an absolute path.  We have to do this because MSVS is looking
      for an actual file to launch a debugger on, not just a command
@@ skipping 116 matching lines @@
     for config, spec in sorted(self.configurations.iteritems()):
       configs.append(spec)
 
     content = ['VisualStudioUserFile',
                {'Version': self.version.ProjectVersion(),
                 'Name': self.name
                },
                configs]
     easy_xml.WriteXmlIfChanged(content, self.user_file_path,
                                encoding="Windows-1252")