Merge branch 'unstable_worker_interface' into unstable
authorForrest Voight <forrest@forre.st>
Tue, 16 Aug 2011 02:42:07 +0000 (22:42 -0400)
committerForrest Voight <forrest@forre.st>
Tue, 16 Aug 2011 02:42:07 +0000 (22:42 -0400)

Trivial merge