Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 9 Oct 2013 19:06:16 +0000 (12:06 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 9 Oct 2013 19:06:16 +0000 (12:06 -0700)

Trivial merge