Merge branch 'hacking'
authorDavid Schleef <ds@schleef.org>
Wed, 2 Jun 2010 18:31:26 +0000 (11:31 -0700)
committerDavid Schleef <ds@schleef.org>
Wed, 2 Jun 2010 18:31:26 +0000 (11:31 -0700)
commitd13b2b8287424c3a46b4a7ee1215eaa80fa3cd69
treef8187fa247ee005e73c52933d4f0df492befd1c2
parenta7fe2c391c0b1972675929bb0235388a9e79a19a
parent6ceb310dc6ab14d02c82b2e2b104746525dcbe34
Merge branch 'hacking'