2010-10-16-roma-6

Taxonomy upgrade extras: