am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1

* commit '87ed42d065653aa30b2d1b8b220b75375cf9af30':
  Don't spuriously time out restore sessions
tree: a14464123bebfff64910d7c44b1759a699a6caa8
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE