Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 10 Sep 2013 00:16:53 +0000 (17:16 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 10 Sep 2013 00:16:53 +0000 (17:16 -0700)

Trivial merge