Commit 0ede290b3a509f0ff02058ed73cba564c82405c1

Niels Provos 2009-01-19T23:42:19

from trunk: bug fix and potentital race condition from Alexander Drozdov svn:r1026