tree d039affaa54d38985e41566e4d62e0aa6a170287
parent 6f2f38128170814e151cfedf79532e19cd179567
parent 8be3de3fd8469154a2b3e18a4712032dac5b4a53
author  <jgarzik@pretzel.yyz.us> 1117857296 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117857296 -0400

Automatic merge of /spare/repo/linux-2.6/.git branch HEAD