desktopcouch

Merge proposals dependent on lp://qastaging/~mandel/desktopcouch/add_windows_keyring_import

  1. add_windows_keyring_import
  2. Dependent merge proposals

lp://qastaging/~mandel/desktopcouch/add_windows_keyring_import has no merge proposals.