Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Fri, 13 Feb 2009 00:11:50 +0000 (19:11 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Fri, 13 Feb 2009 00:11:50 +0000 (19:11 -0500)
commitcadb991940633888988df530819ce9465cd688ed
tree8f92a733796c6d77bc530e93299d6a92cc993c3d
parent387848dfa7081364094a71ff70f65bb1cbd83d8b
parent472cb2447cded21c3279f314d6f9cf159d34f73f
Merge commit 'dkg/master'

Conflicts:

src/share/ma/setup
src/share/ma/setup