commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-tips/rev/20f19d6b1c84a66004085aa4716664070cb4c04a


changeset:   93:20f19d6b1c84a66004085aa4716664070cb4c04a
tag:         tip
parent:      92:c22849363cfac48c47d49b8fe35695fed3dfe124
parent:      91:6e6dbadb651cb7cb55a37a2b93f4057792549a91
user:        Michael Prokop <mika at grml.org>
date:        Tue Oct 02 14:49:44 2007 +0200
files:       grml_tips
description:
Merge branches