commit: Merge heads

[Michael Prokop]

Changeset available online at:

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


changeset:   125:2fb5dbd6cfc9bffa93021b1dfc98205c317492a0
tag:         tip
parent:      124:54d5e58b05881fb3916f644b5dc10170480a4663
parent:      123:ce78db0c6dae5113a793e21ac6ee748aca7b09a4
user:        Michael Prokop
date:        Wed Jul 30 18:13:26 2008 +0200
files:       
description:
Merge heads