commit d2d9bec249071e6ae62edf73e83f082297cdf5b0 Merge: 793e85d 25579f1 095f524 Author: Neal Becker <ndbecker2 at gmail.com> Date: Wed Aug 25 09:33:14 2010 -0400 Initial pseudo merge for dist-git setup ---