Merge heads 3.3.
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 16 Mar 2013 20:06:52 +0000 (16:06 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 16 Mar 2013 20:06:52 +0000 (16:06 -0400)

Trivial merge