Index: llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py
===================================================================
--- llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py
+++ llvm/trunk/utils/llvm-build/llvmbuild/componentinfo.py
@@ -9,7 +9,7 @@
     import ConfigParser as configparser
 import sys
 
-from llvmbuild.util import *
+from llvmbuild.util import fatal, warning
 
 class ParseError(Exception):
     pass
Index: llvm/trunk/utils/llvm-build/llvmbuild/main.py
===================================================================
--- llvm/trunk/utils/llvm-build/llvmbuild/main.py
+++ llvm/trunk/utils/llvm-build/llvmbuild/main.py
@@ -5,7 +5,7 @@
 import llvmbuild.componentinfo as componentinfo
 import llvmbuild.configutil as configutil
 
-from llvmbuild.util import *
+from llvmbuild.util import fatal, note
 
 ###