commit: merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-infrastructure/rev/9d6f4b4c4bcfec5ed8a5261b8f8108fda5b6b0bc


changeset:   39:9d6f4b4c4bcfec5ed8a5261b8f8108fda5b6b0bc
tag:         tip
parent:      38:bcc243ce65f7b252de763a8b663dc44ccc70bb53
parent:      37:044dbf13d41f80dfdb4dc4065efe57768e847304
user:        Michael Prokop <mika at grml.org>
date:        Tue May 08 09:46:34 2007 +0200
files:       
description:
merge branches