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

Trivial merge