Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 13 Jul 2012 01:12:03 +0000 (18:12 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 13 Jul 2012 01:12:03 +0000 (18:12 -0700)

Trivial merge