# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1335782277 -7200
# Node ID 4160b352322eaa91735e5954cae8677a2d469036
# Parent  84a15985a644c9220597e5292fb44cb8573306f4# Parent  656b1b63db8600865e6c23159fa4d9061b9d7230
Merge branch 'stable'