2011-03-21-libya-08

Taxonomy upgrade extras: