Commit b4d33e46c4b00d36783f5b75c1316b7a74c4da20

nulltoken 2013-05-14T21:54:26

Fix some memory leaks