Tagging trunk at r34199 so that the smoke2smolder can later be synched to it.