Commit 19911e57e72e5b8abb789a18c67e4b00af293d24

Scott Dial 2011-09-26T20:16:24

Correct some memory management issues.