Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 12 Sep 2013 19:39:24 +0000 (12:39 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 12 Sep 2013 19:39:24 +0000 (12:39 -0700)

Trivial merge