Merge 'trunk' into 'current'

Merge 'trunk' into 'current'

r35110@brandon-blacks-computer (orig r3534):  blblack | 2007-06-26 21:59:01 -0500
0.04001, dump_overwrite -> really_erase_my_files
r51939@brandon-blacks-computer (orig r3563):  blblack | 2007-07-02 10:24:29 -0500
fix test skips on Win32
r52201@brandon-blacks-computer (orig r3576):  blblack | 2007-07-10 09:42:02 -0500
fix RT#28073
r52202@brandon-blacks-computer (orig r3577):  blblack | 2007-07-10 09:52:42 -0500
changes updates for the last two fixes
r52203@brandon-blacks-computer (orig r3578):  blblack | 2007-07-10 09:56:56 -0500
credits