am e80545f0: am 9967e9db: Merge "add an entry for the new libgui" into gingerbread

Merge commit 'e80545f00d819f0ef300e3146b404d382288fb4e'

* commit 'e80545f00d819f0ef300e3146b404d382288fb4e':
  add an entry for the new libgui