Merge branch 'Gtk' into Gtk-Screen.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 22 Nov 2013 21:00:41 +0000 (14:00 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 22 Nov 2013 21:00:41 +0000 (14:00 -0700)

Trivial merge