# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1288328405 -7200
# Node ID df5f684a883f17f11858a247f6533368a6f2caea
# Parent  cb2ef4c49266a35dde1df2a7a652c5cdb9c124f5# Parent  f60be8147439dc6d4a20a9fb55b899ed0b67f49b
Merge branch 'master' of git://git1.somerandomnick.ano