Merge r10568 and at this occasion simply remove `populate_hdf`.
Authored by: cboos 2011-02-19
Parent: [r10568]
Child: [r10570]