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)
commit7067abb3005518fb96f2e7ef7d60e5eae71d1d65
tree2a068bf80663e9c00f2e94337565f0b9a43cca21
parentea85fd678df845471712f9c50a7a1bac6211221f
parent67ca4737349567922440f3f3862a49e2ffe44fdc
Merge branch 'buildboth'

Conflicts:
Make.defaults