Import folder structure (from patch #2990795)
Authored by: knut_f 2010-10-09
Parent: [r1353]
Child: [r1355]
