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

Trivial merge