# HG changeset patch
# User Chris Cannam
# Date 1309358240 -3600
# Node ID 6f5acaf27d602dd00599c334980bfb17f39a44c6
# Parent  8156537329ffa632c58ff4d4378127c9e914d93c# Parent  f2ab2cdd000b7809c65e9a2e55e5c2eba33900a6
Merge from branch "authfile_refactor"