Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 28 May 2013 05:02:03 +0000 (22:02 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 28 May 2013 05:02:03 +0000 (22:02 -0700)

Trivial merge