2011-03-21-libya-07

Taxonomy upgrade extras: