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

Trivial merge