am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit '2ca7add59f2437c4584029ba081bd4d222445ff9':
  DO NOT MERGE Put additional update package names in config.xml