Reviewed-by: dholmes Contributed-by: NDoug Lea <dl@cs.oswego.edu>
Reviewed-by: alanb Contributed-by: NDoug Lea <dl@cs.oswego.edu>