Merge branch 'master' into upstream-fixes
Jeff Garzik [Tue, 30 Jan 2007 14:14:40 +0000 (09:14 -0500)]

Trivial merge