Merge branch 'buildboth'
authorBdale Garbee <bdale@gag.com>
Mon, 2 Nov 2009 05:27:18 +0000 (22:27 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 2 Nov 2009 05:27:18 +0000 (22:27 -0700)
Conflicts:
Make.defaults


Trivial merge