2008-12-22-demo-2

Taxonomy upgrade extras: