# HG changeset patch
# User Peter Hjalmarsson <xake@telia.com>
# Date 1242676464 0
# Node ID d26e8329f58c4c36e5344cc7b5ab6ca5ed983c23
# Parent  de06818ed80f27b716740a3a6b74c38ff539f778# Parent  6d001f04cd4b16b342fb94af14e447d4954ae419
merge of 'de06818ed80f27b716740a3a6b74c38ff539f778'
     and '6d001f04cd4b16b342fb94af14e447d4954ae419'