Merge "add an entry for the new libgui" into gingerbread