am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo

Merge commit '384759b1c5e39d0f99fa551a369ae73197ab26c5'

* commit '384759b1c5e39d0f99fa551a369ae73197ab26c5':
  Make the default backup configuration "disabled; local transport selected"