Patch from Shawn <sabetts@gmail.com> darcs-hash:20081006120600-dc3a5-8b38d4b33b8928c423919f14a36127e81abc00d8.gz