Merge branch 't/gui_improvements'
authorAndre Noll <maan@systemlinux.org>
Sun, 20 Feb 2011 12:12:32 +0000 (13:12 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 20 Feb 2011 12:12:32 +0000 (13:12 +0100)

Trivial merge