Merge branch 'master' into upstream-fixes
Jeff Garzik [Sun, 17 Sep 2006 05:05:43 +0000 (01:05 -0400)]

Trivial merge