Merge branch 'master' into upstream-fixes

This commit is contained in:
Jeff Garzik 2007-01-30 09:14:40 -05:00
commit 64c9d27d6a
8 changed files with 34 additions and 55 deletions