Merge branch 'daemon' of ssh://gorch/~crh/work/code/Prequel-git into daemon
authorcrh <crh@ubiqx.org>
Fri, 1 Jun 2012 18:13:09 +0000 (13:13 -0500)
committercrh <crh@ubiqx.org>
Fri, 1 Jun 2012 18:13:09 +0000 (13:13 -0500)

Trivial merge