Merge branch 'master' into Gtk 20110609-Gtk 20110610-Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 10 Jun 2011 16:07:00 +0000 (09:07 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 10 Jun 2011 16:07:00 +0000 (09:07 -0700)

Trivial merge