Merge change 10320

* changes:
  Fixed typo, RFC3296 is for LDAP, RFC2396 is for URI
tree: 47dd8bb9cbb6c0d73bad5d58209cb1d4269316b3
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE