Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 16 Oct 2013 00:13:45 +0000 (17:13 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 16 Oct 2013 00:13:45 +0000 (17:13 -0700)

Trivial merge