Merge branch 'master' into upstream-fixes
Jeff Garzik [Sat, 29 Jul 2006 05:39:17 +0000 (01:39 -0400)]

Trivial merge