Merge branch 'Gtk' into Gtk-Screen.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 15 Sep 2013 06:51:19 +0000 (23:51 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 15 Sep 2013 06:51:19 +0000 (23:51 -0700)

Trivial merge