[mercurial: 27/29] Initial pseudo merge for dist-git setup

[Neal Becker]

commit 5640a94125ce616fd021e69ccb6e57596414a901
Merge: 981804b 31204cb f6a7cf0
Author: Neal Becker <nbecker at nbecker1.(none)>
Date:   Mon Aug 2 19:08:17 2010 -0400

    Initial pseudo merge for dist-git setup

---