am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb

* commit 'f6141980c84f64618f083297bc37cfae7e0fca84':
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
tree: 0b8accc2d5b58e5121e60ec38a0a2b829f266455
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE