Attaching a new diff which includes both sets of patches mentioned in this thread. As a bonus, includes two new patch files to silence warnings about "deprecated conversion from string constant to 'char*'".
--patrick
blackbox.diff
Description: Binary data
