Merge change 4910 into donut

* changes:
  fix warnings that will show up with GCC 4.4 (in master)