From: Sam Hartman <hartmans@debian.org>
Date: Tue, 26 Apr 2011 20:53:34 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: dvd/201105~35
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=da4e2fa65e9a3017b695a00d55f00a6c5392b225

Merge branch 'master' into debian

Conflicts:
	libeap
---

da4e2fa65e9a3017b695a00d55f00a6c5392b225