am 60a74642: am 24c8ac3b: Merge "Fix issue #3414328: A couple panics observed during an attempted..." into honeycomb

* commit '60a746426c62bf03b3b5fb494a9cddb9b1ae5166':
  Fix issue #3414328: A couple panics observed during an attempted...
tree: 9deab5762327530c5c1a7dd5d39bd30fdd74ee74
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE