commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/hg-doc/rev/b66c35e431e875a847470a2d51f795eacae61af2


changeset:   49:b66c35e431e875a847470a2d51f795eacae61af2
tag:         tip
parent:      48:1206de670a31043e53832e194b0c3b60fcfedb74
parent:      47:1bea0e4c7559c363bcda6e95b0fef7f30c62a032
user:        Michael Prokop <mika at grml.org>
date:        Sun Oct 28 01:31:03 2007 +0200
files:       
description:
Merge branches