Merge 'speed_daemon' into 'trunk'
authorBrandon L Black <blblack@gmail.com>
Sat, 29 Jul 2006 19:42:28 +0000 (19:42 +0000)
committerBrandon L Black <blblack@gmail.com>
Sat, 29 Jul 2006 19:42:28 +0000 (19:42 +0000)
commit9a2de336889de2db9ce6889a4eb51837ff8d12d5
tree461fe6d7e2a715627adb2d9cd7840700b371da47
parentaed74b25aa7db37941e4ac8bd2affc7a848bb70c
parentcf85d7d3061e639bd707d2c8901be5ca69d2295c
Merge 'speed_daemon' into 'trunk'

r9144@moloko (orig r1752):  blblack | 2006-07-28 02:11:04 -0500
look ma, no recursion