2008-12-22-demo-1

Taxonomy upgrade extras: