Merge 'speed_daemon' into 'trunk'
Brandon L Black [Sat, 29 Jul 2006 19:42:28 +0000 (19:42 +0000)]
r9144@moloko (orig r1752):  blblack | 2006-07-28 02:11:04 -0500
look ma, no recursion


Trivial merge