Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
committerLuke Howard <lukeh@padl.com>
Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
1  2 
accept_sec_context.c
util.h

Simple merge
diff --cc util.h
Simple merge