Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 19 Apr 2013 19:37:11 +0000 (12:37 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 19 Apr 2013 19:37:11 +0000 (12:37 -0700)

Trivial merge