Merge branch 'node_middleware'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 21 Oct 2010 19:56:45 +0000 (15:56 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 21 Oct 2010 19:56:45 +0000 (15:56 -0400)

Trivial merge