# HG changeset patch
# User Heiko Schlittermann <hs@schlittermann.de>
# Date 1236951974 -3600
# Node ID c22ca6b1ad5c23c212ed2139a5b951c5dbeb0d8e
# Parent  8dc39221096a4d73ee73729e2eed1b7b268bc97f# Parent  3dd0ab6f59aed84956abca75f69a77f2ce918d20
merged

diff -r 8dc39221096a -r c22ca6b1ad5c Makefile
diff -r 8dc39221096a -r c22ca6b1ad5c default.in
diff -r 8dc39221096a -r c22ca6b1ad5c init.d.in