merge in brian's change to "Update for async delete"
authorMark Atwood <mark@fallenpegasus.com>
Sun, 14 Oct 2007 20:29:23 +0000 (13:29 -0700)
committerMark Atwood <mark@fallenpegasus.com>
Sun, 14 Oct 2007 20:29:23 +0000 (13:29 -0700)

Trivial merge