Commit 24de9b8655eb50cf304bf01f40e7a14164225dd2

Con Kolivas 2012-12-08T21:23:33

Do not try to clean up twice if kill message is given.