Revert "Disable the cluster-merge tool for the moment"

This reverts commit c0711f2c.

Signed-off-by: Stephen Shirley <diamond@google.com>
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

tools/cluster-merge

 #!/usr/bin/python
 #
 
-# Copyright (C) 2010, 2011 Google Inc.
+# Copyright (C) 2010 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -493,9 +493,6 @@ def main():
 
   (options, args) = parser.parse_args()
 
-  parser.error("Unfortunately this tool is currently broken and cannot"
-               " be used. Sorry!")
-
   SetupLogging(options)
 
   if not args: