am ac2a3585: am 206edb63: am 71c9526e: am 99632b11: manual merge from froyo

Merge commit 'ac2a358546cf2b5bab43a39eb40549d31932c64d' into dalvik-dev

* commit 'ac2a358546cf2b5bab43a39eb40549d31932c64d':
  Plug leak in class initialization.