Merge commit '5ea0a9436cda662264cc0dcf92d3559d532383bb'
* commit '5ea0a9436cda662264cc0dcf92d3559d532383bb':
Fix a memory deallocation error that was crashing q2dm.
'const char*' to make the code build on gcc-4.4.
The C++ spec overloads string fucntions like strtsr and rindex so that
rindex(char *) returns 'char*' and rindex(const char*) returns 'const
char*'.
Without this patch you get an "invalid conversion from ‘const char*’ to
‘char*’" error on gcc-4.4
