Pulling in hammer changes.

site_scons/site_tools/component_bits.py

 #!/usr/bin/python2.4
 # Copyright 2008, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 173 matching lines @@
     args: List of bit names to set.
   """
   _CheckDeclared(args)
   _CheckExclusive(env['_BITS'], args)
   env['_BITS'] = env['_BITS'].union(args)
 
 #------------------------------------------------------------------------------
 
 
 def ClearBits(env, *args):
-  """Sets the bits in the environment.
+  """Clears the bits in the environment.
 
   Args:
     env: Environment to check.
-    args: List of bit names to set.
+    args: List of bit names to clear (remove).
   """
   _CheckDeclared(args)
   env['_BITS'] = env['_BITS'].difference(args)
 
 #------------------------------------------------------------------------------
 
 
 def SetBitFromOption(env, bit_name, default):
   """Sets the bit in the environment from a command line option.
 
@@ skipping 40 matching lines @@
 
   # Add methods to environment
   env.AddMethod(AllBits)
   env.AddMethod(AnyBits)
   env.AddMethod(Bit)
   env.AddMethod(ClearBits)
   env.AddMethod(SetBitFromOption)
   env.AddMethod(SetBits)
 
   env['_BITS'] = set()