Merge remote branch 'remotes/nyergler/569-application-middleware'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 2 Oct 2011 01:45:43 +0000 (20:45 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 2 Oct 2011 01:45:43 +0000 (20:45 -0500)

Trivial merge