commit: merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-infrastructure/rev/3326e27440d520ef0d988b9196614e74c2fca9ad


changeset:   34:3326e27440d520ef0d988b9196614e74c2fca9ad
tag:         tip
parent:      33:534ce684da3e76fae5a45e9cc90a7e643628279e
parent:      32:de8df13f1fd3b9820bb1976339eee95d1422f267
user:        Michael Prokop <mika at grml.org>
date:        Sun May 06 23:18:49 2007 +0200
files:       
description:
merge branches