Merge branch 'master'

This commit is contained in:
Jeff Garzik 2006-03-11 19:58:42 -05:00
commit 000b238bca