am 86ef717e: am 99cee031: Merge change Ieb7a7d57 into eclair-mr2

Merge commit '86ef717e2660dbc914dcf68295fbf9943c45bc44'

* commit '86ef717e2660dbc914dcf68295fbf9943c45bc44':
  Change the DropBoxManager API slightly (this is public, but not yet released) --