Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 3 Feb 2013 01:42:52 +0000 (18:42 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Sun, 3 Feb 2013 01:42:52 +0000 (18:42 -0700)

Trivial merge