merge of feature branch dev-148146 (Atom Zip Export)
Authored by: pangloss 2008-06-24
Parent: [r7355]
Child: [r7357]