diff --git a/lib/crm/cib/cib_version.c b/lib/crm/cib/cib_version.c
index 5cecc49195..1e0eb9ddf4 100644
--- a/lib/crm/cib/cib_version.c
+++ b/lib/crm/cib/cib_version.c
@@ -1,136 +1,136 @@
-/* $Id: cib_version.c,v 1.4 2006/03/18 17:23:48 andrew Exp $ */
+/* $Id: cib_version.c,v 1.5 2006/03/29 06:14:57 andrew Exp $ */
 
 /* 
  * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  * 
  * 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 the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <portability.h>
 
 #include <sys/param.h>
 
 #include <crm/crm.h>
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 
 #include <crm/msg_xml.h>
 #include <crm/common/xml.h>
 #include <crm/cib.h>
 
 #include <crm/dmalloc_wrapper.h>
 
 
 
 const char * feature_sets[] = {
 	"1.1",
 	"1.2",
 };
 
 
 typedef struct tag_set_s 
 {
 		int length;
 		const char **tags;
 } tag_set_t;
 
 
 const char *feature_tags_12[] = { "master_slave", };
 tag_set_t feature_tags[] = {
 	{ 0, NULL },
 	{ 1, feature_tags_12 },
 };
 
 const char *feature_attrs_12[] = { "master_node_max", };
 tag_set_t feature_attrs[] = {
 	{ 0, NULL },
 	{ 1, feature_attrs_12 },
 };
 
 static int
 internal_update_feature_set(crm_data_t *xml_obj, int current)
 {
 	int lpc = current;
 	int lpc_nested = 0;
 	const char *value = NULL;
 	int num_sets = DIMOF(feature_sets);
 
 	CRM_CHECK(compare_version(
 			  CIB_FEATURE_SET, feature_sets[num_sets-1]) == 0,
 		  return num_sets-1);
 
 	for(;lpc < num_sets; lpc++) {
 			
 		const char *tag = crm_element_name(xml_obj);
 		crm_debug_3("Checking set %d with %d tags", lpc,
 			  feature_tags[lpc].length);
 		
 		lpc_nested = 0;
 		for(; lpc_nested < feature_tags[lpc].length; lpc_nested++) {
 			const char *name = feature_tags[lpc].tags[lpc_nested];
 			crm_debug_4("Checking %s vs. %s", tag, name);
 			if(safe_str_eq(tag, name)) {
-				crm_err("Found feature %s from set %s",
-					tag, feature_sets[lpc]);
+				crm_debug_2("Found feature %s from set %s",
+					    tag, feature_sets[lpc]);
 				current = lpc;
 				break;
 			}
 		}
 		if(current == lpc) {
 			continue;
 		}
 
 		lpc_nested = 0;
 		for(; lpc_nested < feature_attrs[lpc].length; lpc_nested++) {
 			const char *name = feature_attrs[lpc].tags[lpc_nested];
 			crm_debug_4("Checking for %s", name);
 			value = crm_element_value(xml_obj, name);
 			if(value != NULL) {
 				crm_err("Found feature %s from set %s",
 					name, feature_sets[lpc]);
 				current = lpc;
 				break;
 			}
 		}
 	}
 
 	if(current == (num_sets -1)) {
 		return current;
 	}
 	
 	xml_child_iter(xml_obj, xml_child, 
 		       current = internal_update_feature_set(xml_child,current);
 		       if(current == (num_sets -1)) {
 			       return current;
 		       }
 		);
 	return current;	
 }
 
 const char *
 feature_set(crm_data_t *xml_obj)
 {
 	int set = internal_update_feature_set(xml_obj, 0);
 	CRM_ASSERT(set < DIMOF(feature_sets));
 	return feature_sets[set];
 }