Merge change 2260

* changes:
  change 2115 wasn't merged properly into master. this fixes that.
tree: 08664922316fd1bc498892751b9ff363dd65fb46
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE