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

Trivial merge