commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/5f8d7c8d74f9b4d565098b0c9c5bdc3e5a05e136


changeset:   159:5f8d7c8d74f9b4d565098b0c9c5bdc3e5a05e136
tag:         tip
parent:      158:35c6eba0e5ceda53e6d34c6cb40c4f35955bafb8
parent:      156:18711c987eaf1eca1d27b8f0d382c319efd5ae1d
user:        Michael Prokop
date:        Sat Oct 13 10:35:49 2007 +0200
files:       debian/changelog
description:
Merge branches