# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1289903405 -3600
# Node ID 689e2f68d4fdedb1f6a24ee4e2d9ba6ac8615090
# Parent  0b37f36e70145bbaccf6b08e9718d7069e14add0# Parent  2cd162725b4728bbd31a52d5d4cb6c7a7f594a89
Merge branch 'master' of git://git1.somerandomnick.ano