Merge change Ifb0a0398 into eclair-mr2

* changes:
  Fix build breakage.  Rename NetStat to TrafficStats in preloaded-classes.