2010-06-26-time-to-organize

Taxonomy upgrade extras: