manual merge
authorJoshua Oreman <oremanj@krypton.lan>
Sat, 2 May 2009 20:07:40 +0000 (13:07 -0700)
committerJoshua Oreman <oremanj@krypton.lan>
Sat, 2 May 2009 20:07:40 +0000 (13:07 -0700)
commitf0898f010d30dcb0fd616ff4fffb7a8e56dc8bd6
tree32341caa8dd748eb76dde42d0ab7f3fe3fff8184
parentb0c7f7a47d7dcca5cd23886c6537f1d070e83356
parentbd69a20f906a77646457eba2d0513dbd0bd5159e
manual merge
src/Makefile.housekeeping