Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 04:29:22 +0000 (21:29 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 17 Sep 2013 04:29:22 +0000 (21:29 -0700)

Trivial merge