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

Trivial merge