SVN revision: 17994
- temporary e_entry fix SVN revision: 17960
- add image widget SVN revision: 17892