commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/1648c1fc7565716de3564fa6a7bde85ecfa7650e


changeset:   340:1648c1fc7565716de3564fa6a7bde85ecfa7650e
tag:         tip
parent:      339:802c8c9c88cd64d99ef07132740e93cc45e794f6
parent:      338:5923d9b173c34ef896a8c5812f264cb22cf6e742
user:        Michael Prokop
date:        Mon Nov 26 19:55:44 2007 +0100
files:       
description:
Merge branches