commit: merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-kernel/rev/2ab18afc389a4f204885a627640b08c4c8fd25a6


changeset:   20:2ab18afc389a4f204885a627640b08c4c8fd25a6
tag:         tip
parent:      19:e7ab3c80e9dd41b7f41a1c8e57d46269b1c71d3d
parent:      18:4f717977acb3f3840e484576389a0bbf3d630f87
user:        Michael Prokop <mika at grml.org>
date:        Sun Jan 21 01:44:14 2007 +0100
files:       
description:
merge branches