commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-infrastructure/rev/eed322b87bde1bfaa238dbe07dd5c9a3da4fb819


changeset:   52:eed322b87bde1bfaa238dbe07dd5c9a3da4fb819
tag:         tip
parent:      51:5680479ca2f2eabc3bf64bb63bfa5f31366a03db
parent:      50:ada389a50a3adfe190c569b18f31fd449f845b3f
user:        Michael Prokop <mika at grml.org>
date:        Fri May 18 14:31:38 2007 +0200
files:       
description:
Merge branches