From: Sam Hartman <hartmans@painless-security.com>
Date: Tue, 3 Jan 2012 16:56:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain

Merge remote-tracking branch 'origin/master'
---

77af50775d819d9a1114617516c9ec8809c46425