David Hull - 2010-05-05

patch for str_replace_tokens bug