Merge branch 'master' into tlv-mic

author Luke Howard <lukeh@padl.com>

Fri, 18 Mar 2011 00:00:11 +0000 (11:00 +1100)

committer Luke Howard <lukeh@padl.com>

Fri, 18 Mar 2011 00:00:11 +0000 (11:00 +1100)
author Luke Howard <lukeh@padl.com>
Fri, 18 Mar 2011 00:00:11 +0000 (11:00 +1100)
committer Luke Howard <lukeh@padl.com>
Fri, 18 Mar 2011 00:00:11 +0000 (11:00 +1100)
diff --cc util.h
Simple merge
diff --cc util_name.c
Simple merge
author	Luke Howard <lukeh@padl.com>
	Fri, 18 Mar 2011 00:00:11 +0000 (11:00 +1100)
committer	Luke Howard <lukeh@padl.com>
	Fri, 18 Mar 2011 00:00:11 +0000 (11:00 +1100)
		1	2
util.h	patch \|	diff1 \|	diff2 \|	blob \| history
util_name.c	patch \|	diff1 \|	diff2 \|	blob \| history