Merge remote-tracking branch 'origin/master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 19 Aug 2011 17:05:02 +0000 (10:05 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 19 Aug 2011 17:05:02 +0000 (10:05 -0700)

Trivial merge