commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/2de8480221b29fb077ce4e1c44e2601b1bbb255f


changeset:   172:2de8480221b29fb077ce4e1c44e2601b1bbb255f
parent:      171:0f451795577772960c21fb50bb97c0667411741d
parent:      170:3e7e47d3aaa0edce10951b6f2341419651c1936e
user:        Michael Prokop
date:        Mon Oct 15 19:04:04 2007 +0200
files:       debian/changelog
description:
Merge branches