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

Trivial merge