Merge branch 'Gtk' into Gtk-Screen.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Mon, 16 Sep 2013 20:40:34 +0000 (13:40 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Mon, 16 Sep 2013 20:40:34 +0000 (13:40 -0700)

Trivial merge