updated 2010-fix-memory-leaks.diff