Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 24 Apr 2013 16:52:52 +0000 (09:52 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Wed, 24 Apr 2013 16:52:52 +0000 (09:52 -0700)

Trivial merge