Merge branch 'ext-mic' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot into...
authorLuke Howard <lukeh@padl.com>
Sat, 16 Jul 2011 11:59:31 +0000 (11:59 +0000)
committerLuke Howard <lukeh@padl.com>
Sat, 16 Jul 2011 11:59:31 +0000 (11:59 +0000)
Conflicts:
moonshot/mech_eap/util_context.c


Trivial merge