commit 4d64440e6e9b5b3585553611d872777b42bc58b0 Merge: 0d2ce50 635df6e Author: Conrad Sanderson <conrad /att/ nospam /dott/ linux /dott/ com> Date: Thu Nov 25 14:49:10 2010 +1000 Initial pseudo merge for dist-git setup ---