Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 8 Mar 2012 18:26:17 +0000 (11:26 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 8 Mar 2012 18:26:17 +0000 (11:26 -0700)

Trivial merge