# HG changeset patch
# User Merten Sach <msach@mailbox.tu-berlin.de>
# Date 1317127914 -7200
# Node ID c11b9dcf6d248ddc8789b9dc464a8d4e3d6d5366
# Parent  eb79d057d10d8e8a5ab8fed7ae0d7bbcf4b9c7ee# Parent  a49f0298015164f487009ae2e95d1f2cc176e3e1
merged dangling head