I've applied this to git. Thanks! There were some lingering bugs in the patch that I sorted out. -Shawn