2011-03-21-libya-06

Taxonomy upgrade extras: