Merge branch 'master' into HEAD

I dropped the changes from 41df7ebc7e for
now, look at this later
master
Paul Goeser 14 years ago
commit 700c3e0bff

Diff Content Not Available