Upstream changes: 0.22 Dec 18 2008 - use strict; use warnings; - Added prototype for caller - silenced warnings about sub replacements