Merge change I852f8e46 into eclair

* changes:
  Only re-initialize backup state if @pm@ metadata is missing, to defensively work around a still-mysterious bug where the list of saved packages ends up being empty even though we still have state pending.  If we do re-initialize, then wipe all state to make sure the right thing happens.
tree: 0309d9da870ce3dd513fd2d9c92893287b716d60
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE