am 99632b11: manual merge from froyo

Merge commit '99632b1107cfec56f07aa4941e770e5d449391b7' into kraken

* commit '99632b1107cfec56f07aa4941e770e5d449391b7':
  Plug leak in class initialization.