# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1289464207 -3600
# Node ID 0b37f36e70145bbaccf6b08e9718d7069e14add0
# Parent  9f8aac25724bb1e66cdbbaccd99a216612c437be# Parent  a12938877531d6c2257c2c82508706caa3b7efa4
Merge branch 'master' of git://git1.somerandomnick.ano