commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-kernel/rev/d86d4fb877026ceff9a8c7bb6a4cbb3a353b4fe5


changeset:   113:d86d4fb877026ceff9a8c7bb6a4cbb3a353b4fe5
tag:         tip
parent:      112:08d47dec6bb4e8809d23eac1462f7fa29840738b
parent:      111:3bcf01d06f949111dc94871499e38d63f623223e
user:        Michael Prokop <mika at grml.org>
date:        Sun Mar 09 00:37:03 2008 +0000
files:       
description:
Merge branches