Joel Young - 2012-03-06

unified diff for scoped_ptr issue