am 46c21a6d: am 86e392e9: Merge "don\'t use compile-time configuration of...
am 46c21a6d: am 86e392e9: Merge "don\'t use compile-time configuration of libgui as much as possible" into jb-mr2-dev
* commit '46c21a6d':
don't use compile-time configuration of libgui as much as possible