commit: Branche merge

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-scripts/rev/efec692c92298e979c7d416bb10d3df0eb4e39f8


changeset:   171:efec692c92298e979c7d416bb10d3df0eb4e39f8
tag:         tip
parent:      170:05dac5352efee07c80f4d054d3b2eb348c22fb63
parent:      169:9ca69228bcec53f2e4efa1f70b850ddfa0d01188
user:        Michael Prokop <mika at grml.org>
date:        Sat Jun 23 00:05:37 2007 +0200
files:       
description:
Branche merge