Merge branch 'Gtk' into Gtk-Screen.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 17 Nov 2013 19:59:48 +0000 (12:59 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 17 Nov 2013 19:59:48 +0000 (12:59 -0700)

Trivial merge