Merge branch 'master' into tlv-mic

author Luke Howard <lukeh@padl.com>

Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)

committer Luke Howard <lukeh@padl.com>

Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
author Luke Howard <lukeh@padl.com>
Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
committer Luke Howard <lukeh@padl.com>
Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
diff --cc mech_eap/accept_sec_context.c
Simple merge
diff --cc mech_eap/util.h
Simple merge
author	Luke Howard <lukeh@padl.com>
	Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
committer	Luke Howard <lukeh@padl.com>
	Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
		1	2
mech_eap/accept_sec_context.c	patch \|	diff1 \|	diff2 \|	blob \| history
mech_eap/util.h	patch \|	diff1 \|	diff2 \|	blob \| history